From 82e7a2dde6222673701b399a5929c1aa8201eb49 Mon Sep 17 00:00:00 2001
From: markspanbroek <mark@spanbroek.net>
Date: Mon, 6 Feb 2023 17:15:02 +0100
Subject: [PATCH] Fix CI (#339)

* [ci] Use Nim version 1.6.10 instead of version-1-6

* [ci] use nimbus-build-system branch support-shallow-checkout
---
 .github/actions/nimbus-build-system/action.yml | 8 ++++----
 .github/workflows/ci.yml                       | 5 ++++-
 vendor/nimbus-build-system                     | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/actions/nimbus-build-system/action.yml b/.github/actions/nimbus-build-system/action.yml
index b78c5596..a4422e36 100644
--- a/.github/actions/nimbus-build-system/action.yml
+++ b/.github/actions/nimbus-build-system/action.yml
@@ -9,7 +9,7 @@ inputs:
   cpu:
     description: "CPU to build for"
     default: "amd64"
-  nim_branch:
+  nim_version:
     description: "Nim version"
     default: "version-1-6"
   shell:
@@ -153,12 +153,12 @@ runs:
       uses: actions/cache@v3
       with:
         path: NimBinaries
-        key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ env.cache_nonce }}-${{ github.run_id }}
-        restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ env.cache_nonce }}
+        key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_version }}-cache-${{ env.cache_nonce }}-${{ github.run_id }}
+        restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_version }}-cache-${{ env.cache_nonce }}
 
     - name: Set NIM_COMMIT
       shell: ${{ inputs.shell }} {0}
-      run: echo "NIM_COMMIT=${{ inputs.nim_branch }}" >> ${GITHUB_ENV}
+      run: echo "NIM_COMMIT=${{ inputs.nim_version }}" >> ${GITHUB_ENV}
 
     - name: Build Nim and Codex dependencies
       shell: ${{ inputs.shell }} {0}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 052b6eb2..70f2dc1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
   workflow_dispatch:
 env:
   cache_nonce: 0 # Allows for easily busting actions/cache caches
+  nim_version: v1.6.10
 jobs:
   build:
     strategy:
@@ -41,6 +42,7 @@ jobs:
         with:
           os: ${{ matrix.os }}
           shell: ${{ matrix.shell }}
+          nim_version: ${{ env.nim_version }}
 
       - name: Unit tests
         run: make -j${ncpu} test
@@ -73,6 +75,7 @@ jobs:
         uses: ./.github/actions/nimbus-build-system
         with:
           os: linux
+          nim_version: ${{ env.nim_version }}
 
       - name: Generate coverage data
         run: make -j${ncpu} coverage
@@ -100,7 +103,7 @@ jobs:
         uses: ./.github/actions/nimbus-build-system
         with:
           os: linux
-          nim_branch: version-1-2
+          nim_version: version-1-2
 
       - name: Unit tests
         run: make -j${ncpu} test
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 72d51e4c..1cf6a1b1 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 72d51e4c320fbdbdee4d6a28c2a621cda44b7143
+Subproject commit 1cf6a1b18ca5aa0d24e7a2861dd85d79ad9cb0cd