From 809132353c0b4a7bd1e9a458ea7daacf285de15e Mon Sep 17 00:00:00 2001 From: gmega Date: Tue, 16 Jan 2024 16:11:11 -0300 Subject: [PATCH] hack nimbus-build-system/github to pick up custom Nim repo/branch --- .github/actions/nimbus-build-system/action.yml | 7 ++++++- .gitmodules | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/actions/nimbus-build-system/action.yml b/.github/actions/nimbus-build-system/action.yml index a4422e36..5b641f44 100644 --- a/.github/actions/nimbus-build-system/action.yml +++ b/.github/actions/nimbus-build-system/action.yml @@ -11,7 +11,8 @@ inputs: default: "amd64" nim_version: description: "Nim version" - default: "version-1-6" + # FIXME: change this once https://github.com/nim-lang/Nim/issues/23214 gets upstreamed/backported + default: "f45bdea94ac4ed9a9bae03426275456aeb0cab2a" shell: description: "Shell to run commands in" default: "bash --noprofile --norc -e -o pipefail" @@ -160,6 +161,10 @@ runs: shell: ${{ inputs.shell }} {0} run: echo "NIM_COMMIT=${{ inputs.nim_version }}" >> ${GITHUB_ENV} + # FIXME: drop this once https://github.com/nim-lang/Nim/issues/23214 gets upstreamed/backported + - name: Set NIM_REPO + run: echo "NIM_REPO='https://github.com/gmega/Nim'" >> ${GITHUB_ENV} + - name: Build Nim and Codex dependencies shell: ${{ inputs.shell }} {0} run: | diff --git a/.gitmodules b/.gitmodules index 19d3c088..d2683bb1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "vendor/nimbus-build-system"] path = vendor/nimbus-build-system - url = https://github.com/status-im/nimbus-build-system.git + url = https://github.com/gmega/nimbus-build-system.git ignore = untracked - branch = master + branch = feat/configurable-nim-repo [submodule "vendor/nim-libp2p"] path = vendor/nim-libp2p url = https://github.com/status-im/nim-libp2p.git