diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index c5fff96..e6233af 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -91,6 +91,14 @@ jobs: exit 1 fi + integration-test-override-yarn: + docker: + - image: cimg/ruby:3.3.5-browsers + steps: + - node/install: + install-yarn: true + node-version: '22.11.0' + integration-test-use-nvmrc-version: parameters: os: @@ -213,7 +221,10 @@ jobs: workflows: test-deploy: jobs: - - integration-test-reinstall-yarn + - integration-test-override-yarn: + filters: *filters + - integration-test-reinstall-yarn: + filters: *filters - integration-test-install-specified-version: filters: *filters matrix: @@ -435,6 +446,7 @@ workflows: - integration-test-pnpm - integration-test-reinstall-yarn - node-yarn-mocha-with-test-result-path-job + - integration-test-override-yarn - node-yarn-mocha-test-job - node-yarn-jest-test-job - node-test-results-file-job diff --git a/src/scripts/install-yarn.sh b/src/scripts/install-yarn.sh index f7dd60d..565764b 100644 --- a/src/scripts/install-yarn.sh +++ b/src/scripts/install-yarn.sh @@ -30,12 +30,12 @@ installation_check () { $SUDO apt-get remove yarn > /dev/null 2>&1 && \ $SUDO apt-get purge yarn > /dev/null 2>&1 OLD_YARN=$(which yarn) - rm "$OLD_YARN" + $SUDO rm "$OLD_YARN" elif grep Ubuntu /etc/issue > /dev/null 2>&1; then $SUDO apt-get remove yarn > /dev/null 2>&1 && \ $SUDO apt-get purge yarn > /dev/null 2>&1 OLD_YARN=$(which yarn) - rm "$OLD_YARN" + $SUDO rm "$OLD_YARN" elif command -v yum > /dev/null 2>&1; then yum remove yarn > /dev/null 2>&1 fi