Skip to content

Commit 00ec72c

Browse files
ci: revise usage of choosenim in Builds workflow
1 parent 541889d commit 00ec72c

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

.github/workflows/builds.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
cache_marker: [ 34 ]
22+
cache_marker: [ 37 ]
2323
platform:
2424
- {
2525
icon: 🐧,
@@ -100,7 +100,7 @@ jobs:
100100
git clone --depth 1 $2 $1 \
101101
--branch $3 2>/dev/null && \
102102
cd $1 && git rev-parse HEAD \
103-
| cut -c1-7)" >> ${GITHUB_OUTPUT}
103+
| cut -c1-10)" >> ${GITHUB_OUTPUT}
104104
}
105105
clone1b choosenim \
106106
https://github.com/dom96/choosenim.git \
@@ -194,14 +194,20 @@ jobs:
194194
if [[ ${{ matrix.platform.os }} = windows ]]; then
195195
mkdir -p "$(cygpath "${USERPROFILE}")/.nimble/bin"
196196
fi
197-
CHOOSENIM_CHOOSE_VERSION=\#${{ matrix.nim_version }} \
198-
CHOOSENIM_NO_ANALYTICS=1 \
197+
export CHOOSENIM_CHOOSE_VERSION=\#${{ steps.cache-key.outputs.nim_commit }}
198+
export CHOOSENIM_NO_ANALYTICS=1
199199
./init.sh -y
200200
if [[ ${{ matrix.platform.os }} = windows ]]; then
201201
mv "$(cygpath "${USERPROFILE}")/.nimble" "${HOME}/"
202202
fi
203+
export NIMBLE_DIR="${HOME}/.nimble"
204+
export PATH="${NIMBLE_DIR}/bin:${PATH}"
203205
echo 'export NIMBLE_DIR="${HOME}/.nimble"' >> "${HOME}/.bash_env"
204206
echo 'export PATH="${NIMBLE_DIR}/bin:${PATH}"' >> "${HOME}/.bash_env"
207+
echo
208+
nim --version
209+
echo
210+
nimble --version
205211
206212
# maybe can be reworked (along with caching logic) re: Nimble
207213
# corresponding to Nim v2, with conditional logic for older Nim/Nimble

0 commit comments

Comments
 (0)