update ci.yml to test Nim 2.2; also test gcc-14 (#17)

status-im · Sep 11, 2024 · 02311a3 · 02311a3
1 parent 45b06fc
commit 02311a3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,25 +14,39 @@ jobs:
         target:
           - os: linux
             cpu: amd64
+          - os: linux-gcc-14 # This is to use ubuntu 24 and install gcc 14. Should be removed when ubuntu-latest is 26.04
+            cpu: amd64
           - os: linux
             cpu: i386
           - os: macos
             cpu: amd64
+          - os: macos
+            cpu: arm64
           - os: windows
             cpu: amd64
-        branch: [version-1-6, version-2-0, devel]
+        branch: [version-2-0, version-2-2, devel]
         include:
           - target:
               os: linux
-            builder: ubuntu-20.04
+            builder: ubuntu-latest
+            shell: bash
+          - target:
+              os: linux-gcc-14 # This is to use ubuntu 24 and install gcc 14. Should be removed when ubuntu-latest is 26.04
+            builder: ubuntu-24.04
             shell: bash
           - target:
               os: macos
-            builder: macos-12
+              cpu: amd64
+            builder: macos-13
+            shell: bash
+          - target:
+              os: macos
+              cpu: arm64
+            builder: macos-latest
             shell: bash
           - target:
               os: windows
-            builder: windows-2019
+            builder: windows-latest
             shell: msys2 {0}
 
     defaults:
@@ -43,7 +57,7 @@ jobs:
     runs-on: ${{ matrix.builder }}
     steps:
       - name: Checkout nim-zlib
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -91,7 +105,7 @@ jobs:
       - name: Restore Nim DLLs dependencies (Windows) from cache
         if: runner.os == 'Windows'
         id: windows-dlls-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: external/dlls
           key: 'dlls'
@@ -115,6 +129,8 @@ jobs:
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
             PLATFORM=x64
+          elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
+            PLATFORM=arm64
           else
             PLATFORM=x86
           fi
@@ -146,6 +162,14 @@ jobs:
             bash build_nim.sh nim csources dist/nimble NimBinaries
           echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
 
+      - name: Use gcc 14
+        if : ${{ matrix.target.os == 'linux-gcc-14' }}
+        run: |
+          # Add GCC-14 to alternatives
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
+          # Set GCC-14 as the default
+          sudo update-alternatives --set gcc /usr/bin/gcc-14
+
       - name: Run nim-zlib tests
         run: |
           if [[ "${{ matrix.target.os }}" == "windows" ]]; then
@@ -154,6 +178,7 @@ jobs:
           fi
           nim --version
           nimble --version
+          gcc --version
           nimble install -y --depsOnly
           rm -f nimble.lock
           env TEST_LANG="c" nimble test

diff --git a/zlib.nimble b/zlib.nimble
@@ -32,10 +32,10 @@ proc test(args, path: string) =
     path
 
 task test, "Run all tests":
-  test "-d:debug", "tests/test_all"
-  test "-d:release", "tests/test_all"
-  test "--threads:on -d:release", "tests/test_all"
+  test "-d:debug --mm:refc", "tests/test_all"
+  test "-d:release --mm:refc", "tests/test_all"
+  test "--threads:on -d:release --mm:refc", "tests/test_all"
   if (NimMajor, NimMinor) > (1, 6):
-    test "-d:debug  --mm:refc", "tests/test_all"
-    test "-d:release --mm:refc", "tests/test_all"
-    test "--threads:on -d:release --mm:refc", "tests/test_all"
+    test "-d:debug  --mm:orc", "tests/test_all"
+    test "-d:release --mm:orc", "tests/test_all"
+    test "--threads:on -d:release --mm:orc", "tests/test_all"