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

status-im · Sep 11, 2024 · c36724c · c36724c
1 parent ae476c6
commit c36724c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,27 +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
-          #- os: windows
-            #cpu: i386
-        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:
@@ -46,7 +58,7 @@ jobs:
     continue-on-error: ${{ matrix.branch == 'devel' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install build dependencies (Linux i386)
         if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
@@ -92,7 +104,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-${{ matrix.target.cpu }}
           key: 'dlls-${{ matrix.target.cpu }}'
@@ -117,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
@@ -148,9 +162,19 @@ jobs:
             bash build_nim.sh nim csources dist/nimble NimBinaries
           echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
 
+      - name: Use gcc 14
+        # Should be removed when ubuntu-latest is 26.04
+        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 tests
         run: |
           nim --version
           nimble --version
+          gcc --version
           nimble install -y --depsOnly
           nimble test
diff --git a/testutils.nimble b/testutils.nimble
@@ -18,11 +18,18 @@ proc execCmd(cmd: string) =
 
 proc execTest(test: string) =
   let test = "ntu test " & test
-  execCmd "nim c           -f -r " & test
-  execCmd "nim c   -d:release -r " & test
-  execCmd "nim c   -d:danger  -r " & test
-  execCmd "nim cpp            -r " & test
-  execCmd "nim cpp -d:danger  -r " & test
+  execCmd "nim c   --mm:refc         -f -r " & test
+  execCmd "nim c   --mm:refc -d:release -r " & test
+  execCmd "nim c   --mm:refc -d:danger  -r " & test
+  execCmd "nim cpp --mm:refc            -r " & test
+  execCmd "nim cpp --mm:refc -d:danger  -r " & test
+  if (NimMajor, NimMinor) > (1, 6):
+    execCmd "nim c   --mm:orc         -f -r " & test
+    execCmd "nim c   --mm:orc -d:release -r " & test
+    execCmd "nim c   --mm:orc -d:danger  -r " & test
+    execCmd "nim cpp --mm:orc            -r " & test
+    execCmd "nim cpp --mm:orc -d:danger  -r " & test
+
   execCmd "nim c   --gc:arc --exceptions:goto -r " & test
   when false:
     # we disable gc:arc test here because Nim cgen