Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use setup-dfx github action #519

Closed
wants to merge 2 commits into from
Closed

fix: use setup-dfx github action #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8890fc
fix: use setup-dfx github action
ericswanson-dfinity Feb 21, 2024
9f4a454
main
ericswanson-dfinity Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ jobs:
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-1

- name: Setup fix
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: Setup fix
- name: Setup dfx

uses: dfinity/setup-dfx@main
with:
dfx-version: ${{ matrix.dfx }}
- name: Provision Darwin
if: contains(matrix.os, 'macos')
run: bash .github/workflows/provision-darwin.sh
env:
INSTALL_DFX_VERSION: ${{ matrix.dfx }}
- name: Provision Linux
if: contains(matrix.os, 'ubuntu')
run: bash .github/workflows/provision-linux.sh
env:
INSTALL_DFX_VERSION: ${{ matrix.dfx }}
- name: Setup for dfx version differences
run: |
if [[ "${{ matrix.dfx }}" == "0.8.4" ]]; then
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/provision-darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ mkdir /usr/local/lib/bats-support
tar --directory /usr/local/lib/bats-support --extract --file bats-support.tar.gz --strip-components 1
rm bats-support.tar.gz

# Install DFINITY SDK.
curl --location --output install-dfx.sh "https://sdk.dfinity.org/install.sh"
DFX_VERSION="$INSTALL_DFX_VERSION" bash install-dfx.sh < <(yes Y)
rm install-dfx.sh

# Set environment variables.
BATS_SUPPORT="/usr/local/lib/bats-support"
echo "BATS_SUPPORT=${BATS_SUPPORT}" >> "$GITHUB_ENV"
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/provision-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ sudo mkdir /usr/local/lib/bats-support
sudo tar --directory /usr/local/lib/bats-support --extract --file bats-support.tar.gz --strip-components 1
rm bats-support.tar.gz

# Install DFINITY SDK.
wget --output-document install-dfx.sh "https://sdk.dfinity.org/install.sh"
DFX_VERSION="$INSTALL_DFX_VERSION" bash install-dfx.sh < <(yes Y)
rm install-dfx.sh

# Set environment variables.
BATS_SUPPORT="/usr/local/lib/bats-support"
echo "BATS_SUPPORT=${BATS_SUPPORT}" >> "$GITHUB_ENV"
Expand Down
Loading