.cirrus.yml

@@ -1,14 +1,7 @@
+freebsd_instance:
+  image_family: freebsd-12-1
+
 main_task:
-
-  matrix:
-    - name: freebsd_12_1
-      freebsd_instance:
-        image_family: freebsd-12-1
-
-    - name: freebsd_13_0
-      freebsd_instance:
-        image_family: freebsd-13-0
-
   install_script:
     - uname -a
     - pkg install -y cmake
@@ -64,4 +57,4 @@ main_task:
     - ls
     - ctest -VV
     - cd ..
-    - rm -r build/*
+    - rm -r build/* 

.drone.yml

@@ -1,7 +1,4 @@
 ---
-# NOTE: there were some problems when we just used `alpine` image so we pinned the exaxt
-# version. Consider returning to just `alpine` image when it will be fixed.
-
 kind: pipeline
 name: test-on-amd64
 
@@ -10,7 +7,7 @@ platform:
 
 steps:
   - name: test
-    image: alpine:3.12.3
+    image: alpine
     commands:
       - apk add gcc g++ cmake make binutils-gold
       - ls
@@ -23,7 +20,7 @@ steps:
       - ctest -VV
 
   - name: test-tcc-compiler
-    image: alpine:3.12.3
+    image: alpine
     commands:
       - apk add gcc g++ cmake make binutils-gold
       # tcc available only in in edge alpine repo
@@ -50,7 +47,7 @@ platform:
 
 steps:
   - name: test
-    image: alpine:3.12.3
+    image: alpine
     commands:
       - apk add gcc g++ cmake make binutils-gold
       - ls
@@ -71,7 +68,7 @@ platform:
 
 steps:
   - name: test
-    image: alpine:3.12.3
+    image: alpine
     commands:
       - apk add gcc g++ cmake make binutils-gold
       - ls

ChangeLog.md

@@ -7,11 +7,6 @@
 ### Bug fixes
 
 - Fix `ft_printf_ln` when it is used for position which have empty cells before it.
-- Fix invalid `enum ft_color` values.
-
-### Internal
-
-- Update CI pipelines on different platforms.
 
 ## v0.4.2
 

README.md

@@ -1,6 +1,6 @@
 # libfort (Library to create FORmatted Tables)
 
-[![Build Status](https://travis-ci.com/seleznevae/libfort.svg?branch=master)](https://travis-ci.com/seleznevae/libfort)
+[![Build Status](https://travis-ci.org/seleznevae/libfort.svg?branch=master)](https://travis-ci.org/seleznevae/libfort)
 [![Build Status](https://api.cirrus-ci.com/github/seleznevae/libfort.svg)](https://cirrus-ci.com/github/seleznevae/libfort)
 [![Build status](https://ci.appveyor.com/api/projects/status/ll1qygb56pho95xw/branch/master?svg=true)](https://ci.appveyor.com/project/seleznevae/libfort/branch/master)
 [![Build Status](https://cloud.drone.io/api/badges/seleznevae/libfort/status.svg?ref=refs/heads/master)](https://cloud.drone.io/seleznevae/libfort)
@@ -344,7 +344,6 @@ The following compilers are currently used in continuous integration at [Travis]
 | AppleClang 8.1.0   | Darwin Kernel Version 16.7.0 |
 | AppleClang 9.1.0   | Darwin Kernel Version 17.4.0 |
 | Clang 8.0.1        | FreeBSD 12.1                 |
-| Clang 11.0.1       | FreeBSD 13.0                 |
 | Visual Studio 2017 | Windows Server 2016          |
 
 

lib/fort.c

@@ -2832,10 +2832,9 @@ size_t ft_row_count(const ft_table_t *table)
 size_t ft_col_count(const ft_table_t *table)
 {
     assert(table && table->rows);
-    size_t i = 0;
     size_t cols_n = 0;
     size_t rows_n = vector_size(table->rows);
-    for (i = 0; i < rows_n; ++i) {
+    for (size_t i = 0; i < rows_n; ++i) {
         f_row_t *row = VECTOR_AT(table->rows, i, f_row_t *);
         size_t ncols = columns_in_row(row);
         cols_n = MAX(cols_n, ncols);

lib/fort.h

@@ -820,9 +820,9 @@ enum ft_color {
     FT_COLOR_LIGHT_GREEN    = 11, /**< Light green color */
     FT_COLOR_LIGHT_YELLOW   = 12, /**< Light yellow color */
     FT_COLOR_LIGHT_BLUE     = 13, /**< Light blue color */
-    FT_COLOR_LIGHT_MAGENTA  = 14, /**< Light magenta color */
-    FT_COLOR_LIGHT_CYAN     = 15, /**< Light cyan color */
-    FT_COLOR_LIGHT_WHYTE    = 16  /**< Light whyte color */
+    FT_COLOR_LIGHT_MAGENTA  = 15, /**< Light magenta color */
+    FT_COLOR_LIGHT_CYAN     = 16, /**< Light cyan color */
+    FT_COLOR_LIGHT_WHYTE    = 17  /**< Light whyte color */
 };
 
 /**

src/fort.h

@@ -820,9 +820,9 @@ enum ft_color {
     FT_COLOR_LIGHT_GREEN    = 11, /**< Light green color */
     FT_COLOR_LIGHT_YELLOW   = 12, /**< Light yellow color */
     FT_COLOR_LIGHT_BLUE     = 13, /**< Light blue color */
-    FT_COLOR_LIGHT_MAGENTA  = 14, /**< Light magenta color */
-    FT_COLOR_LIGHT_CYAN     = 15, /**< Light cyan color */
-    FT_COLOR_LIGHT_WHYTE    = 16  /**< Light whyte color */
+    FT_COLOR_LIGHT_MAGENTA  = 15, /**< Light magenta color */
+    FT_COLOR_LIGHT_CYAN     = 16, /**< Light cyan color */
+    FT_COLOR_LIGHT_WHYTE    = 17  /**< Light whyte color */
 };
 
 /**

src/fort_impl.c

@@ -236,10 +236,9 @@ size_t ft_row_count(const ft_table_t *table)
 size_t ft_col_count(const ft_table_t *table)
 {
     assert(table && table->rows);
-    size_t i = 0;
     size_t cols_n = 0;
     size_t rows_n = vector_size(table->rows);
-    for (i = 0; i < rows_n; ++i) {
+    for (size_t i = 0; i < rows_n; ++i) {
         f_row_t *row = VECTOR_AT(table->rows, i, f_row_t *);
         size_t ncols = columns_in_row(row);
         cols_n = MAX(cols_n, ncols);

tests/package_tests/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 if (NOT DEFINED libfort_LIBRARIES)
 	message(FATAL_ERROR "libfort_LIBRARIES are not defined")
 endif()
-if (NOT ${libfort_VERSION} EQUAL "0.5.0")
+if (NOT ${libfort_VERSION} EQUAL "0.4.1")
 	message(FATAL_ERROR "libfort_VERSION is incorrect")
 endif()