From b0ade0dd4a00eb527de2aaf9cd1a57864877188f Mon Sep 17 00:00:00 2001
From: Xiao-Yong Jin <xjin@anl.gov>
Date: Tue, 3 Jan 2023 17:04:04 -0600
Subject: [PATCH 1/3] github/workflow: use ci/funs.sh in Nim to bootstrap Nim
 for different versions

---
 .github/workflows/test.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 688148b3..22127f17 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,22 +45,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:

From 66fd366af61475a90b209dfc20c117ba5e86ad07 Mon Sep 17 00:00:00 2001
From: Xiao-Yong Jin <xjin@anl.gov>
Date: Tue, 3 Jan 2023 17:08:07 -0600
Subject: [PATCH 2/3] github/workflow: drop tests against version-1-4

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 22127f17..531fd327 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ 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 }}

From 7198a7e2d1878b86f716b2d76922609a91fd6f4f Mon Sep 17 00:00:00 2001
From: Xiao-Yong Jin <xjin@anl.gov>
Date: Tue, 3 Jan 2023 17:27:27 -0600
Subject: [PATCH 3/3] github/workflows: run ci test only on push_request or
 push to devel or main

---
 .github/workflows/test.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 531fd327..1000edb4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,10 @@
 name: test
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'devel'
+      - 'master'
 
 jobs:
   build: