chore: update test workflows to use dfxvm (#709)

dfinity · Feb 9, 2024 · 1802f72 · 1802f72
1 parent 781b9e8
commit 1802f72
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 70 deletions.
diff --git a/.github/workflows/motoko-encrypted-notes-vetkd-example.yml b/.github/workflows/motoko-encrypted-notes-vetkd-example.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     paths:
       - motoko/encrypted-notes-dapp-vetkd/**
-      - motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
+      - .github/workflows/provision-darwin.sh
       - .github/workflows/provision-linux.sh
       - .github/workflows/motoko-encrypted-notes-vetkd-example.yml
 concurrency:
@@ -19,8 +19,8 @@ jobs:
       - uses: actions/checkout@v1
       - name: Provision Darwin
         env:
-          DFX_VERSION: 0.14.2
-        run: bash motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
+          NODE_VERSION: 14.21.3
+        run: bash .github/workflows/provision-darwin.sh
       - name: Motoko Encrypted Notes Darwin (unit tests)
         run: |
           pushd motoko/encrypted-notes-dapp-vetkd

diff --git a/.github/workflows/motoko-hello_cycles-example.yaml b/.github/workflows/motoko-hello_cycles-example.yaml
@@ -21,7 +21,7 @@ jobs:
         run: bash .github/workflows/provision-darwin.sh
       - name: Motoko Hello Cycles Darwin
         run: |
-          dfx upgrade
+          dfxvm update
           dfx start --background --clean
           pushd motoko/hello_cycles
           make test
@@ -34,7 +34,7 @@ jobs:
         run: bash .github/workflows/provision-linux.sh
       - name: Motoko Hello Cycles Linux
         run: |
-          dfx upgrade
+          dfxvm update
           dfx start --background --clean
           pushd motoko/hello_cycles
           make test

diff --git a/.github/workflows/provision-darwin.sh b/.github/workflows/provision-darwin.sh
@@ -17,9 +17,11 @@ sudo installer -pkg node.pkg -store -target /
 rm node.pkg
 
 # Install DFINITY SDK.
-curl --location --output install-dfx.sh "https://internetcomputer.org/install.sh"
-DFX_VERSION=${DFX_VERSION:=0.16.1} bash install-dfx.sh < <(yes Y)
+curl --location --output install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/dfxvm-install-script/install.sh"
+DFX_VERSION=${DFX_VERSION:=0.16.1} DFXVM_INIT_YES=true bash install-dfx.sh
 rm install-dfx.sh
+echo "$HOME/Library/Application Support/org.dfinity.dfx/bin" >> $GITHUB_PATH
+source "$HOME/Library/Application Support/org.dfinity.dfx/env"
 dfx cache install
 
 # Install ic-repl

diff --git a/.github/workflows/provision-linux.sh b/.github/workflows/provision-linux.sh
@@ -12,9 +12,11 @@ sudo apt-get install --yes nodejs
 rm install-node.sh
 
 # Install DFINITY SDK.
-wget --output-document install-dfx.sh "https://internetcomputer.org/install.sh"
-DFX_VERSION=${DFX_VERSION:=0.16.1} bash install-dfx.sh < <(yes Y)
+wget --output-document install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/dfxvm-install-script/install.sh"
+DFX_VERSION=${DFX_VERSION:=0.16.1} DFXVM_INIT_YES=true bash install-dfx.sh
 rm install-dfx.sh
+echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH
+source "$HOME/.local/share/dfx/env"
 dfx cache install
 
 # Install ic-repl

diff --git a/.github/workflows/rust-encrypted-notes-vetkd-example.yml b/.github/workflows/rust-encrypted-notes-vetkd-example.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     paths:
       - motoko/encrypted-notes-dapp-vetkd/**
-      - motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
+      - .github/workflows/provision-darwin.sh
       - .github/workflows/provision-linux.sh
       - .github/workflows/rust-encrypted-notes-vetkd-example.yml
 concurrency:
@@ -20,7 +20,8 @@ jobs:
       - name: Provision Darwin
         env:
           DFX_VERSION: 0.14.2
-        run: bash motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
+          NODE_VERSION: 14.21.3
+        run: bash .github/workflows/provision-darwin.sh
       - name: Rust Encrypted Notes Darwin (unit tests)
         run: |
           pushd motoko/encrypted-notes-dapp-vetkd

diff --git a/.github/workflows/rust-send-http-get-example.yml b/.github/workflows/rust-send-http-get-example.yml
@@ -21,7 +21,7 @@ jobs:
         run: bash .github/workflows/provision-darwin.sh
       - name: Rust Send HTTP GET Darwin
         run: |
-          dfx upgrade
+          dfxvm update
           dfx start --background
           pushd rust/send_http_get
           RUSTFLAGS=-Ctarget-cpu=mvp make test
@@ -34,7 +34,7 @@ jobs:
         run: bash .github/workflows/provision-linux.sh
       - name: Rust Send HTTP GET Linux
         run: |
-          dfx upgrade          
+          dfxvm update
           dfx start --background
           pushd rust/send_http_get
           RUSTFLAGS=-Ctarget-cpu=mvp make test

diff --git a/.github/workflows/rust-send-http-post-example.yml b/.github/workflows/rust-send-http-post-example.yml
@@ -21,7 +21,7 @@ jobs:
         run: bash .github/workflows/provision-darwin.sh
       - name: Rust Send HTTP POST Darwin
         run: |
-          dfx upgrade          
+          dfxvm update
           dfx start --background
           pushd rust/send_http_post
           RUSTFLAGS=-Ctarget-cpu=mvp make test
@@ -34,7 +34,7 @@ jobs:
         run: bash .github/workflows/provision-linux.sh
       - name: Rust Send HTTP POST Linux
         run: |
-          dfx upgrade
+          dfxvm update
           dfx start --background
           pushd rust/send_http_post
           RUSTFLAGS=-Ctarget-cpu=mvp make test

diff --git a/motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh b/motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh