From 0d4bfb8baa8b6f599acfc1e06d9b9bace831ebbe Mon Sep 17 00:00:00 2001 From: Eric Swanson <64809312+ericswanson-dfinity@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:46:35 -0800 Subject: [PATCH] chore: update default dfx version to 0.16.0 (#645) --- .github/workflows/motoko-invoice-e2e.yaml | 7 ++++++- .github/workflows/motoko-invoice-unit.yaml | 2 +- .github/workflows/provision-darwin.sh | 2 +- .github/workflows/provision-linux.sh | 2 +- motoko/invoice-canister/package.json | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/motoko-invoice-e2e.yaml b/.github/workflows/motoko-invoice-e2e.yaml index 90f39d575..019539c9d 100644 --- a/.github/workflows/motoko-invoice-e2e.yaml +++ b/.github/workflows/motoko-invoice-e2e.yaml @@ -1,4 +1,5 @@ -name: motoko-invoice-canister +# Known failure: https://dfinity.atlassian.net/browse/EM-9 +name: motoko-invoice-canister-e2e on: push: branches: @@ -18,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v1 - name: Provision Darwin + env: + NODE_VERSION: 19.8.1 run: bash .github/workflows/provision-darwin.sh - name: Install vessel run: | @@ -44,6 +47,7 @@ jobs: EOF - name: Motoko Invoice Canister Darwin run: | + dfx extension install nns --version 0.2.1 pushd motoko/invoice-canister make e2e dfx stop @@ -81,6 +85,7 @@ jobs: EOF - name: Motoko Invoice Canister Linux run: | + dfx extension install nns --version 0.2.1 pushd motoko/invoice-canister make e2e dfx stop diff --git a/.github/workflows/motoko-invoice-unit.yaml b/.github/workflows/motoko-invoice-unit.yaml index 8f3213131..ed904888b 100644 --- a/.github/workflows/motoko-invoice-unit.yaml +++ b/.github/workflows/motoko-invoice-unit.yaml @@ -1,4 +1,4 @@ -name: motoko-invoice-canister +name: motoko-invoice-canister-unit on: push: branches: diff --git a/.github/workflows/provision-darwin.sh b/.github/workflows/provision-darwin.sh index fb84438fc..cffe43633 100755 --- a/.github/workflows/provision-darwin.sh +++ b/.github/workflows/provision-darwin.sh @@ -18,7 +18,7 @@ rm node.pkg # Install DFINITY SDK. curl --location --output install-dfx.sh "https://internetcomputer.org/install.sh" -DFX_VERSION=${DFX_VERSION:=0.12.0} bash install-dfx.sh < <(yes Y) +DFX_VERSION=${DFX_VERSION:=0.16.0} bash install-dfx.sh < <(yes Y) rm install-dfx.sh dfx cache install diff --git a/.github/workflows/provision-linux.sh b/.github/workflows/provision-linux.sh index 308447a4e..c5a0c7592 100755 --- a/.github/workflows/provision-linux.sh +++ b/.github/workflows/provision-linux.sh @@ -13,7 +13,7 @@ rm install-node.sh # Install DFINITY SDK. wget --output-document install-dfx.sh "https://internetcomputer.org/install.sh" -DFX_VERSION=${DFX_VERSION:=0.12.0} bash install-dfx.sh < <(yes Y) +DFX_VERSION=${DFX_VERSION:=0.16.0} bash install-dfx.sh < <(yes Y) rm install-dfx.sh dfx cache install diff --git a/motoko/invoice-canister/package.json b/motoko/invoice-canister/package.json index 28089c638..631bc50a1 100644 --- a/motoko/invoice-canister/package.json +++ b/motoko/invoice-canister/package.json @@ -44,9 +44,9 @@ "whatwg-url": "^5.0.0" }, "scripts": { - "test": "cd test/e2e; npm ci; npm test", + "test": "cd test/e2e; npm ci && npm test", "deployAll": "node clean-startup.mjs", - "deployForTesting": "node clean-startup.mjs --deployForTesting --quiet; dfx generate invoice" + "deployForTesting": "node clean-startup.mjs --deployForTesting --quiet && dfx generate invoice" }, "repository": { "type": "git",