Skip to content

Commit 0ea3422

Browse files
authored
Update to RISC0 v3.0.3 (#3431)
1 parent a54e209 commit 0ea3422

File tree

8 files changed

+1962
-891
lines changed

8 files changed

+1962
-891
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
env:
2626
SKIP: ormolu,format-juvix-files,typecheck-juvix-examples
2727
CAIRO_VM_VERSION: 6c324e0d761013f38b8b743e515a65ac1a380206
28-
RISC0_VM_VERSION: v1.0.1
28+
RISC0_VM_VERSION: v3.0.3
2929
# This is the top commit hash in the branch lukasz/juvix-ci-stable
3030
# of the anoma repository.
3131
ANOMA_VERSION: c8c2a385dd916a28982918fdc22da90c409e347a
@@ -44,8 +44,6 @@ jobs:
4444

4545
ormolu:
4646
runs-on: ubuntu-latest
47-
env:
48-
STACK_RESOLVER: lts-21.25
4947
steps:
5048
- uses: actions/checkout@v3
5149
- uses: extractions/setup-just@v2
@@ -56,17 +54,27 @@ jobs:
5654
- name: Generate juvix.cabal
5755
run: hpack
5856

57+
- name: Add ~/.local/bin to PATH
58+
run: |
59+
mkdir -p "$HOME/.local/bin"
60+
echo "$HOME/.local/bin" >> $GITHUB_PATH
61+
5962
- name: Cache ormolu
6063
id: ormolu-cache
6164
uses: actions/cache@v3
6265
with:
6366
path: |
6467
~/.local/bin/ormolu
65-
key: ${{ runner.os }}-ormolu-${{ env.STACK_RESOLVER }}
68+
key: ${{ runner.os }}-ormolu-0.5.3.0
6669

6770
- name: Install ormolu
6871
if: steps.ormolu-cache.outputs.cache-hit != 'true'
69-
run: stack install ormolu --resolver=${{ env.STACK_RESOLVER }}
72+
run: |
73+
curl -L https://github.com/tweag/ormolu/releases/download/0.5.3.0/ormolu-Linux.zip -o ormolu.zip
74+
unzip ormolu.zip
75+
mkdir -p $HOME/.local/bin
76+
mv ormolu $HOME/.local/bin/ormolu
77+
chmod +x $HOME/.local/bin/ormolu
7078
7179
- name: Run ormolu
7280
run: just format check
@@ -235,7 +243,7 @@ jobs:
235243
run: |
236244
curl -L https://risczero.com/install | bash
237245
~/.risc0/bin/rzup install
238-
~/.risc0/bin/rzup install r0vm 1.2.6
246+
~/.risc0/bin/rzup install r0vm 3.0.3
239247
240248
- name: Checkout CairoVM
241249
uses: actions/checkout@v4

runtime/rust/juvix/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod tests {
3030
} else {
3131
tmp1 = program_fib(FUN_FIB, vec![smallint_sub(args[0], make_smallint(1))]);
3232
tmp2 = program_fib(FUN_FIB, vec![smallint_sub(args[0], make_smallint(2))]);
33-
break (smallint_add(tmp1, tmp2));
33+
break smallint_add(tmp1, tmp2);
3434
}
3535
}
3636
_ => panic!("unknown function id"),

0 commit comments

Comments
 (0)