Skip to content

Commit

Permalink
Merge branch 'main' into typos/range-check-16
Browse files Browse the repository at this point in the history
  • Loading branch information
querolita committed Nov 27, 2024
2 parents 240c96a + 7476d6c commit c5c7e69
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch: {}

concurrency:
group: ${{ github.ref }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch: {}

concurrency:
group: ${{ github.ref }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/build-bindings.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Purpose: We want to build the o1js bindings in CI so that people in the
# Purpose: We want to build the o1js bindings in CI so that people in the
# community can change them without being scared of breaking things, or
# needing to do the complicated (without nix) build setup.

Expand All @@ -7,19 +7,30 @@ name: Build o1js bindings
on:
pull_request:

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
nix-build:
name: build-bindings-ubuntu
runs-on: [sdk-self-hosted-linux-amd64-build-system]
steps:
- name: Set up Nix
run: echo "PATH=$PATH:/nix/var/nix/profiles/default/bin" >> $GITHUB_ENV
- name: Disable smudging
run: echo "GIT_LFS_SKIP_SMUDGE=1" >> $GITHUB_ENV
- uses: actions/checkout@v4
with:
submodules: recursive
- run: |
- name: Build the o1js bindings
run: |
set -Eeu
# Until we restart the runner and the PATH gets updated from /etc/bash.bashrc
export PATH="$PATH":/nix/var/nix/profiles/default/bin
./pin.sh
nix develop o1js --command bash -c "npm run build:update-bindings"
- name: Cleanup the Nix store
run: |
nix-env --delete-generations old
nix-collect-garbage -d --quiet
nix-store --gc --print-dead
nix-store --optimise
4 changes: 4 additions & 0 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Build-Doc:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/live-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
workflow_dispatch: {}

concurrency:
group: ${{ github.ref }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down

0 comments on commit c5c7e69

Please sign in to comment.