From 3100a10b49b2e9119cafbbd1557d304269b69784 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 6 Oct 2021 14:09:30 +0200 Subject: [PATCH 1/5] Update ubuntu image --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc5a4c09..194ae396 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ jobs: # executor in local jobs." (https://circleci.com/docs/2.0/local-cli/#limitations-of-running-jobs-locally) # # Available images: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images - image: ubuntu-2004:202010-01 + image: ubuntu-2004:202107-02 steps: - run: name: Install Git Large File Storage (LFS) @@ -183,7 +183,7 @@ jobs: # executor in local jobs." (https://circleci.com/docs/2.0/local-cli/#limitations-of-running-jobs-locally) # # Available images: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images - image: ubuntu-2004:202010-01 + image: ubuntu-2004:202107-02 steps: - run: name: Install Git Large File Storage (LFS) @@ -296,7 +296,7 @@ jobs: # executor in local jobs." (https://circleci.com/docs/2.0/local-cli/#limitations-of-running-jobs-locally) # # Available images: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images - image: ubuntu-2004:202010-01 + image: ubuntu-2004:202107-02 steps: - run: name: Install Git Large File Storage (LFS) @@ -396,7 +396,7 @@ jobs: # executor in local jobs." (https://circleci.com/docs/2.0/local-cli/#limitations-of-running-jobs-locally) # # Available images: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images - image: ubuntu-2004:202010-01 + image: ubuntu-2004:202107-02 steps: - run: name: Install Git Large File Storage (LFS) From bdcfe6906232d47f9e2e754cfdb63ff42e1eb828 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 6 Oct 2021 14:10:27 +0200 Subject: [PATCH 2/5] Update uninstall step --- .circleci/config.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 194ae396..835fa463 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,10 +100,12 @@ jobs: name: Merge build folders into project (merge with hardlinks) command: cp --recursive --link /tmp/builds/* . - run: - # The images ubuntu-1604 comes with preinstalled nvm, which does not work well with non-login shells + # The images comes with preinstalled nvm, which does not work well with non-login shells name: Uninstall nvm # Moving to trash is faster than deleting (gvfs-trash is not installed on this image) - command: mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash + command: | + nvm --version && nvm ls + mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash - run: name: Install nodejs # In the current image, `sudo apt install nodejs` requires `sudo apt update` which is too slow @@ -218,10 +220,12 @@ jobs: name: Merge build folders into project (merge with hardlinks) command: cp --recursive --link /tmp/builds/* . - run: - # The images ubuntu-1604 comes with preinstalled nvm, which does not work well with non-login shells + # The images comes with preinstalled nvm, which does not work well with non-login shells name: Uninstall nvm # Moving to trash is faster than deleting (gvfs-trash is not installed on this image) - command: mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash + command: | + nvm --version && nvm ls + mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash - run: name: Install nodejs # In the current image, `sudo apt install nodejs` requires `sudo apt update` which is too slow @@ -331,10 +335,12 @@ jobs: name: Merge build folders into project (merge with hardlinks) command: cp --recursive --link /tmp/builds/* . - run: - # The images ubuntu-1604 comes with preinstalled nvm, which does not work well with non-login shells + # The images comes with preinstalled nvm, which does not work well with non-login shells name: Uninstall nvm # Moving to trash is faster than deleting (gvfs-trash is not installed on this image) - command: mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash + command: | + nvm --version && nvm ls + mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash - run: name: Install nodejs # In the current image, `sudo apt install nodejs` requires `sudo apt update` which is too slow @@ -431,10 +437,12 @@ jobs: name: Merge build folders into project (merge with hardlinks) command: cp --recursive --link /tmp/builds/* . - run: - # The images ubuntu-1604 comes with preinstalled nvm, which does not work well with non-login shells + # The images comes with preinstalled nvm, which does not work well with non-login shells name: Uninstall nvm # Moving to trash is faster than deleting (gvfs-trash is not installed on this image) - command: mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash + command: | + nvm --version && nvm ls + mkdir -p ~/.local/share/Trash && mv "$NVM_DIR" ~/.npm ~/.local/share/Trash - run: name: Install nodejs # In the current image, `sudo apt install nodejs` requires `sudo apt update` which is too slow From ec54866ee3f677fe2984e86a73522f93c4e9bab8 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 6 Oct 2021 14:11:44 +0200 Subject: [PATCH 3/5] Upgrade test-node-v12 to test-node-v14 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 835fa463..16ad5069 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ workflows: - test: requires: - build - - test-node-v12: + - test-node-v14: requires: - build - test-chrome: @@ -176,7 +176,7 @@ jobs: ./scripts/simapp/slow_stop.sh ./scripts/wasmd/stop.sh ./scripts/launchpad/stop.sh - test-node-v12: + test-node-v14: machine: # We can't use a containerized environment since it requires remote docker to start custom containers. # However, we can't access the remote docker's network from the primary container. This is a @@ -230,7 +230,7 @@ jobs: name: Install nodejs # In the current image, `sudo apt install nodejs` requires `sudo apt update` which is too slow command: | - wget -O "$HOME/nodejs.deb" https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.20.1-deb-1nodesource1_amd64.deb + wget -O "$HOME/nodejs.deb" https://deb.nodesource.com/node_14.x/pool/main/n/nodejs/nodejs_14.18.0-deb-1nodesource1_amd64.deb sudo dpkg -i "$HOME/nodejs.deb" - run: name: Install yarn From dec47791d8ea38cb09de554e1500915c77d56f62 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 6 Oct 2021 14:12:53 +0200 Subject: [PATCH 4/5] Upgrade yarn v1 install --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 16ad5069..6d7847ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,7 +115,7 @@ jobs: - run: name: Install yarn command: | - wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb + wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.15_all.deb sudo dpkg -i "$HOME/yarn.deb" - run: name: Version information @@ -235,7 +235,7 @@ jobs: - run: name: Install yarn command: | - wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb + wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.15_all.deb sudo dpkg -i "$HOME/yarn.deb" - run: name: Version information @@ -350,7 +350,7 @@ jobs: - run: name: Install yarn command: | - wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb + wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.15_all.deb sudo dpkg -i "$HOME/yarn.deb" - run: name: Version information @@ -452,7 +452,7 @@ jobs: - run: name: Install yarn command: | - wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb + wget -O "$HOME/yarn.deb" https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.15_all.deb sudo dpkg -i "$HOME/yarn.deb" - run: name: Version information From 1a395f29227ed217c3388e370cc8e0a7bc323713 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 6 Oct 2021 14:57:54 +0200 Subject: [PATCH 5/5] Install chrome via orb --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d7847ee..194ee475 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,8 @@ -version: 2 +version: 2.1 + +orbs: + browser-tools: circleci/browser-tools@1.2.2 + workflows: version: 2 workflow: @@ -302,6 +306,7 @@ jobs: # Available images: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images image: ubuntu-2004:202107-02 steps: + - browser-tools/install-chrome # Slow because apt update but what can you do 🤷‍ - run: name: Install Git Large File Storage (LFS) # In the current image, `sudo apt install git-lfs` requires `sudo apt update` which is too slow