Update CI actions and software versions

artemis-beta · May 25, 2023 · 928db5b · 928db5b
1 parent 9fd7f03
commit 928db5b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/.github/workflows/futs.yml b/.github/workflows/futs.yml
@@ -7,11 +7,11 @@ jobs:
     name: Ubuntu Latest Tests
     runs-on: 'ubuntu-22.04'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.12
+        uses: jwlawson/actions-setup-cmake@v1.14
         with:
-          cmake-version: '3.24.x'
+          cmake-version: '3.26.x'
       - name: Install GFortran 12
         run: sudo apt install -y gfortran-12
       - name: Build Tests
@@ -45,7 +45,7 @@ jobs:
             sudo apt install -y lcov
             lcov --gcov-tool $(which gcov) --directory . --capture --output-file temp.info -b src/
             lcov --remove temp.info 'tests/*' 'tests/test_assertions/*' -o FortUTF.info
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         continue-on-error: true
         with:
           file: FortUTF.info

diff --git a/.github/workflows/futs_mac.yml b/.github/workflows/futs_mac.yml
@@ -10,9 +10,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.12
+        uses: jwlawson/actions-setup-cmake@v1.14
         with:
-          cmake-version: '3.24.x'
+          cmake-version: '3.26.x'
       - name: Install GFortran macOS
         run: brew install gcc@12
       - name: Build Tests

diff --git a/.github/workflows/futs_windows.yml b/.github/workflows/futs_windows.yml
@@ -9,14 +9,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.12
+        uses: jwlawson/actions-setup-cmake@v1.14
         with:
-          cmake-version: '3.24.x'
-      - name: Build and Run Tests
+          cmake-version: '3.26.x'
+      - name: Build Tests
         run: |
-            choco upgrade mingw --version="'11.2.0'" -y
+            choco upgrade mingw --version="'12.2.0'" -y
             choco install -y make
             cmake -G "Unix Makefiles" -Bbuild -DBUILD_TESTS=ON
             cmake --build build
-            ./build/FortUTF_Tests.exe
+      - name: Run Tests
+        run: ./build/FortUTF_Tests.exe
 
diff --git a/tests/test_assertions/test_equal_int.f90 b/tests/test_assertions/test_equal_int.f90
@@ -3,7 +3,7 @@ SUBROUTINE TEST_ASSERT_EQ_PASS_INT_1BYTE
     INTEGER(1) :: X, Y
     X = 4
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_PASS_INT_1BYTE")
 
     ! As this test should pass we can leave the
@@ -15,11 +15,11 @@ END SUBROUTINE TEST_ASSERT_EQ_PASS_INT_1BYTE
 
 SUBROUTINE TEST_ASSERT_EQ_PASS_INT_2BYTE
     USE FORTUTF
-    
+
     INTEGER(2) :: X, Y
     X = 4
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_PASS_INT_2BYTE")
 
     ! As this test should pass we can leave the
@@ -31,7 +31,7 @@ END SUBROUTINE TEST_ASSERT_EQ_PASS_INT_2BYTE
 
 SUBROUTINE TEST_ASSERT_EQ_PASS_INT_4BYTE
     USE FORTUTF
-    
+
     INTEGER(4) :: X, Y
     X = 4
     Y = 4
@@ -47,7 +47,7 @@ END SUBROUTINE TEST_ASSERT_EQ_PASS_INT_4BYTE
 
 SUBROUTINE TEST_ASSERT_EQ_PASS_INT_8BYTE
     USE FORTUTF
-    
+
     INTEGER(8) :: X, Y
     X = 4
     Y = 4
@@ -66,7 +66,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_1BYTE
     INTEGER(1) :: X, Y
     X = 2
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_1BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -80,7 +80,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_2BYTE
     INTEGER(2) :: X, Y
     X = 2
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_2BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -94,7 +94,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_4BYTE
     INTEGER(4) :: X, Y
     X = 2
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_4BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -108,7 +108,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_8BYTE
     INTEGER(1) :: X, Y
     X = 2
     Y = 4
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_8BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -122,7 +122,7 @@ SUBROUTINE TEST_ASSERT_EQ_PASS_INT_ARR_1BYTE
     INTEGER(1), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/1, 2, 3, 4/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_PASS_INT_ARR_1BYTE")
 
     ! As this test should pass we can leave the
@@ -137,7 +137,7 @@ SUBROUTINE TEST_ASSERT_EQ_PASS_INT_ARR_2BYTE
     INTEGER(2), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/1, 2, 3, 4/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_PASS_INT_ARR_2BYTE")
 
     ! As this test should pass we can leave the
@@ -182,7 +182,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_ARR_1BYTE
     INTEGER(1), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/2, 4, 5, 8/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_ARR_1BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -196,7 +196,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_ARR_2BYTE
     INTEGER(2), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/2, 4, 5, 8/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_ARR_2BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -210,7 +210,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_ARR_4BYTE
     INTEGER(4), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/2, 4, 5, 8/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_ARR_4BYTE")
 
     CALL ASSERT_EQUAL(X, Y)
@@ -224,7 +224,7 @@ SUBROUTINE TEST_ASSERT_EQ_FAIL_INT_ARR_8BYTE
     INTEGER(8), DIMENSION(4) :: X, Y
     X = (/1, 2, 3, 4/)
     Y = (/2, 4, 5, 8/)
-    
+
     CALL TAG_TEST("TEST_ASSERT_EQ_FAIL_INT_ARR_8BYTE")
 
     CALL ASSERT_EQUAL(X, Y)