diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 3eee3a54..348e1eab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 diff --git a/.github/workflows/provision-darwin.sh b/.github/workflows/provision-darwin.sh index 8bc94f4d..0b4fee67 100755 --- a/.github/workflows/provision-darwin.sh +++ b/.github/workflows/provision-darwin.sh @@ -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" diff --git a/.github/workflows/provision-linux.sh b/.github/workflows/provision-linux.sh index 5706a16e..ad770919 100755 --- a/.github/workflows/provision-linux.sh +++ b/.github/workflows/provision-linux.sh @@ -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"