Merge branch 'jcosborn:devel' into devel

ctpeterson · Jan 11, 2023 · 64ea316 · 64ea316
2 parents 4bdb83f + 7198a7e
commit 64ea316
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,11 +1,16 @@
 name: test
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'devel'
+      - 'master'
 
 jobs:
   build:
     strategy:
       matrix:
-        nim-branch: [version-1-4, version-1-6, version-2-0, devel]
+        nim-branch: [version-1-6, version-2-0, devel]
         fuel-compat: [0, 1]
       fail-fast: false
     name: nim-${{ matrix.nim-branch }}-FUELCompat:${{ matrix.fuel-compat }}
@@ -45,22 +50,16 @@ jobs:
         repository: nim-lang/Nim
         ref: ${{ matrix.nim-branch }}
         path: Nim
-    - name: checkout Nim csources
-      uses: actions/checkout@v3
-      with:
-        repository: nim-lang/csources_v1
-        path: Nim/csources
     - name: set path to nim
       run: echo "${{ github.workspace }}/Nim/bin" >> $GITHUB_PATH
-    - name: build Nim csources
-      working-directory: Nim/csources
-      run: make -j $(nproc)
     - name: build Nim & nimble
       working-directory: Nim
       run: |
-        nim c koch
-        ./koch boot -d:release -d:danger
-        ./koch nimble -d:release -d:danger
+        . ci/funs.sh
+        nimBuildCsourcesIfNeeded
+        ./bin/nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
+        ./koch boot -d:release -d:danger --skipUserCfg --skipParentCfg --hints:off
+        ./koch nimble -d:release -d:danger --skipUserCfg --skipParentCfg --hints:off
     - name: checkout
       uses: actions/checkout@v3
       with: