Skip to content

Commit

Permalink
Allow compiler version to be pinned consistently (#832)
Browse files Browse the repository at this point in the history
* allow compiler version to be pinned consistently

* set pin to v1.6.14 to make it equivalent to current master
  • Loading branch information
gmega authored Jun 17, 2024
1 parent e124035 commit 6e9bdf1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
cache_nonce: 0 # Allows for easily busting actions/cache caches
nim_version: v1.6.14
nim_version: pinned


concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nim-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
cache_nonce: 0 # Allows for easily busting actions/cache caches
nim_version: v1.6.14, v1.6.16, v1.6.18
nim_version: pinned, v1.6.16, v1.6.18

jobs:
matrix:
Expand Down
24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,30 @@
# at your option. This file may not be copied, modified, or distributed except
# according to those terms.

# This is the Nim version used locally and in regular CI builds.
# Can be a specific version tag, a branch name, or a commit hash.
# Can be overridden by setting the NIM_COMMIT environment variable
# before calling make.
#
# For readability in CI, if NIM_COMMIT is set to "pinned",
# this will also default to the version pinned here.
#
# If NIM_COMMIT is set to "nimbusbuild", this will use the
# version pinned by nimbus-build-system.
PINNED_NIM_VERSION := v1.6.14

ifeq ($(NIM_COMMIT),)
NIM_COMMIT := $(PINNED_NIM_VERSION)
else ifeq ($(NIM_COMMIT),pinned)
NIM_COMMIT := $(PINNED_NIM_VERSION)
endif

ifeq ($(NIM_COMMIT),nimbusbuild)
undefine NIM_COMMIT
else
export NIM_COMMIT
endif

SHELL := bash # the shell used internally by Make

# used inside the included makefiles
Expand Down

0 comments on commit 6e9bdf1

Please sign in to comment.