Skip to content

Commit 49d2b09

Browse files
committed
address comment: ./koch fusion calls nimble install fusion (at a fixed hash)
1 parent cbe9704 commit 49d2b09

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.github/workflows/ci_docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ jobs:
126126
shell: bash
127127
run: ./koch boot -d:release
128128

129+
- name: './koch fusion'
130+
shell: bash
131+
run: ./koch fusion
132+
129133
- name: 'Build documentation'
130134
shell: bash
131135
run: ./koch doc --git.commit:devel

changelog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,5 +188,5 @@ with other backends. see #9125. Use `-d:nimLegacyJsRound` for previous behavior.
188188
row (`:---`, `:--:`, `---:`) are ignored,
189189
- every table row must start with `|`, e.g. `| cell 1 | cell 2 |`.
190190

191-
- `fusion` is now un-bundled from nim, `./koch fusion` will result in an error.
192-
`nimble install fusion` should be used instead.
191+
- `fusion` is now un-bundled from nim, `./koch fusion` will
192+
install it via nimble at a fixed hash.

koch.nim

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
const
1313
NimbleStableCommit = "324de9202fb3db82b266e7350731d1ec41013a2b" # master
14-
14+
# examle of possible values: #head, #ea82b54, 1.2.3
15+
FusionStableCommitHash = "#372ee4313827ef9f2ea388840f7d6b46c2b1b014"
16+
HeadHash = "#head"
1517
when not defined(windows):
1618
const
1719
Z3StableCommit = "65de3f748a6812eecd7db7c478d5fc54424d368b" # the version of Z3 that DrNim uses
@@ -65,6 +67,7 @@ Possible Commands:
6567
e.g. nimble)
6668
doesn't require network connectivity
6769
nimble builds the Nimble tool
70+
fusion installs fusion via Nimble
6871
6972
Boot options:
7073
-d:release produce a release version of the compiler
@@ -689,7 +692,9 @@ when isMainModule:
689692
of "valgrind": valgrind(op.cmdLineRest)
690693
of "c2nim": bundleC2nim(op.cmdLineRest)
691694
of "drnim": buildDrNim(op.cmdLineRest)
692-
of "fusion": doAssert false, "`./koch fusion` was deprecated, use `nimble install fusion` instead"
695+
of "fusion":
696+
let suffix = if latest: HeadHash else: FusionStableCommitHash
697+
exec("nimble install -y fusion@$#" % suffix)
693698
else: showHelp()
694699
break
695700
of cmdEnd: break

0 commit comments

Comments
 (0)