Skip to content

Commit

Permalink
Switch to dfinity/setup-dfx action (#2346)
Browse files Browse the repository at this point in the history
This PR removes our local `setup-dfx` action and replaces it with the one
maintained by the SDK team. This action has the advantage that it integrates
with the new `dfxvm` and reads the desired dfx version from `dfx.json`.

Adding the version there also aligns the dfx version used locally with the
one on CI. The dfx version will be bumped to `0.18.0` in a follow-up
commit.

Side-note on CI runtime: the `dfinity/setup-dfx` does not use caching
(unlike our version) but still takes only about 4s to complete.
Given that we get rid of some complexity that way, I think the 3s are
worth it.

Also, because the `dfinity/setup-dfx` action is not yet properly published
on the market place (there is an open issue for that [here](dfinity/setup-dfx#8))
a specific commit is pinned instead.
  • Loading branch information
frederikrothenberger committed Mar 11, 2024
1 parent 056aee3 commit b419b80
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 37 deletions.
33 changes: 0 additions & 33 deletions .github/actions/setup-dfx/action.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/canister-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ jobs:
- name: Kickstart npm ci
run: '{ npm ci --no-audit --no-fund; echo "$?" > ~/npm-ci-status; } &'

- uses: ./.github/actions/setup-dfx
- uses: dfinity/setup-dfx@0c1c03fb1a56008724b5d05ddfec0eef9479bdf8

# Helps with debugging
- name: Show versions
Expand Down Expand Up @@ -545,7 +545,7 @@ jobs:
google-chrome --version
- uses: ./.github/actions/setup-node
- uses: ./.github/actions/setup-dfx
- uses: dfinity/setup-dfx@0c1c03fb1a56008724b5d05ddfec0eef9479bdf8

# Helps with debugging
- name: Show versions
Expand Down Expand Up @@ -600,7 +600,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-dfx
- uses: dfinity/setup-dfx@0c1c03fb1a56008724b5d05ddfec0eef9479bdf8

- name: 'Download II wasm'
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: "Print shasum of found build"
run: shasum -a 256 ./internet_identity_production.wasm.gz

- uses: ./.github/actions/setup-dfx
- uses: dfinity/setup-dfx@0c1c03fb1a56008724b5d05ddfec0eef9479bdf8

- name: 'Install key'
env:
Expand Down
1 change: 1 addition & 0 deletions dfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"packtool": ""
}
},
"dfx": "0.15.3",
"version": 1
}

0 comments on commit b419b80

Please sign in to comment.