Skip to content

Commit

Permalink
fix: use setup-dfx github action
Browse files Browse the repository at this point in the history
  • Loading branch information
ericswanson-dfinity committed Feb 21, 2024
1 parent c32b112 commit c8890fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yml
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
uses: dfinity/setup-dfx@vmai
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
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
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

0 comments on commit c8890fc

Please sign in to comment.