Skip to content

Commit

Permalink
chore(CI): remove nix from CI (#4314)
Browse files Browse the repository at this point in the history
# Description

## Problem\*

Resolves <!-- Link to GitHub Issue -->

## Summary\*

This PR removes nix from the CI workflows

## Additional Context



## Documentation\*

Check one:
- [ ] No documentation needed.
- [ ] Documentation included in this PR.
- [ ] **[Exceptional Case]** Documentation to be submitted in a separate
PR.

# PR Checklist\*

- [ ] I have tested the changes locally.
- [ ] I have formatted the changes with [Prettier](https://prettier.io/)
and/or `cargo fmt` on default settings.
  • Loading branch information
TomAFrench authored Feb 9, 2024
1 parent ca0a56e commit bd15d30
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 98 deletions.
27 changes: 0 additions & 27 deletions .github/actions/nix/action.yml

This file was deleted.

64 changes: 33 additions & 31 deletions .github/workflows/publish-es-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,29 @@ jobs:
build-noirc_abi_wasm:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
- name: Checkout Noir repo
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref }}

- name: Setup Nix
uses: ./.github/actions/nix
- name: Setup toolchain
uses: dtolnay/[email protected]

- uses: Swatinem/rust-cache@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: "noir"
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
key: noirc-abi
save-if: false

- name: Build wasm package
run: |
nix build -L .#noirc_abi_wasm
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build noirc_abi
run: ./.github/scripts/noirc-abi-build.sh

- uses: actions/upload-artifact@v4
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: noirc_abi_wasm
path: |
result/noirc_abi_wasm/nodejs
result/noirc_abi_wasm/web
path: ./tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm
retention-days: 10

build-noir_wasm:
runs-on: ubuntu-latest
Expand All @@ -64,7 +65,7 @@ jobs:
run: yarn workspace @noir-lang/types build

- name: Build noir_wasm
run: yarn workspace @noir-lang/noir_wasm build
run: ./.github/scripts/noir-wasm-build.sh

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand All @@ -80,26 +81,27 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref }}

- name: Setup Nix
uses: ./.github/actions/nix
- name: Setup toolchain
uses: dtolnay/[email protected]

- uses: Swatinem/rust-cache@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: "noir"
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
key: acvm-js
save-if: false

- name: Build wasm package
run: |
nix build -L .#acvm_js
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build acvm_js
run: ./.github/scripts/acvm_js-build.sh

- uses: actions/upload-artifact@v4
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: acvm_js
path: |
result/acvm_js/nodejs
result/acvm_js/web
name: acvm-js
path: ./acvm-repo/acvm_js/outputs/out/acvm_js
retention-days: 3

publish-es-packages:
runs-on: ubuntu-latest
Expand Down
83 changes: 43 additions & 40 deletions .github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,98 +46,101 @@ jobs:
path: ./dist/*
retention-days: 3

build-noir-wasm:
build-noirc-abi:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- name: Checkout sources
- name: Checkout Noir repo
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/[email protected]

- uses: Swatinem/rust-cache@v2
with:
key: noir-wasm
key: noirc-abi
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build noir_js_types
run: yarn workspace @noir-lang/types build

- name: Build noir_wasm
run: yarn workspace @noir-lang/noir_wasm build
- name: Build noirc_abi
run: ./.github/scripts/noirc-abi-build.sh

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: noir_wasm
path: |
./compiler/wasm/dist
./compiler/wasm/build
retention-days: 3
name: noirc_abi_wasm
path: ./tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm
retention-days: 10

build-acvm-js:

build-noir-wasm:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Nix
uses: ./.github/actions/nix
- name: Setup toolchain
uses: dtolnay/[email protected]

- uses: Swatinem/rust-cache@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: "noir"
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
key: noir-wasm
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Build acvm-js
run: |
nix build -L .#acvm_js
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Dereference symlink
run: echo "UPLOAD_PATH=$(readlink -f result/acvm_js)" >> $GITHUB_ENV
- name: Build noir_js_types
run: yarn workspace @noir-lang/types build

- name: Build noir_wasm
run: ./.github/scripts/noir-wasm-build.sh

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: acvm-js
path: ${{ env.UPLOAD_PATH }}
name: noir_wasm
path: |
./compiler/wasm/dist
./compiler/wasm/build
retention-days: 3

build-noirc-abi:
build-acvm-js:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Nix
uses: ./.github/actions/nix
- name: Setup toolchain
uses: dtolnay/[email protected]

- uses: Swatinem/rust-cache@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: "noir"
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
key: acvm-js
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Build noirc_abi_wasm
run: |
nix build -L .#noirc_abi_wasm
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Dereference symlink
run: echo "UPLOAD_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV
- name: Build acvm_js
run: ./.github/scripts/acvm_js-build.sh

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: noirc_abi_wasm
path: ${{ env.UPLOAD_PATH }}
retention-days: 10
name: acvm-js
path: ./acvm-repo/acvm_js/outputs/out/acvm_js
retention-days: 3

test-acvm_js-node:
needs: [build-acvm-js]
Expand Down

0 comments on commit bd15d30

Please sign in to comment.