diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 541b264e0d1..5d55a7de37e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -771,6 +771,7 @@ jobs: release-dashmate: name: Release Dashmate packages runs-on: ${{ matrix.os }} + needs: release-npm strategy: fail-fast: false matrix: @@ -795,7 +796,7 @@ jobs: - name: Install macOS build deps if: runner.os == 'macOS' run: | - brew install llvm docker colima + brew install llvm docker colima coreutils colima start echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH @@ -822,11 +823,6 @@ jobs: restore-keys: | ${{ runner.os }}-yarn-unplugged- - # Workaround for lack of yarn 3 support in oclif - - name: Patch package-json - run: | - echo "$(jq '. |= .+ { "dependencies": {"debug": "^4.3.4", "lodash": "^4.17.21", "strip-ansi": "^6.0.1", "fs-extra": "^8.1" },}' package.json)" > package.json - - name: Install dependencies run: yarn install env: diff --git a/scripts/pack_dashmate.sh b/scripts/pack_dashmate.sh index edb7dff261e..69c9c789eed 100755 --- a/scripts/pack_dashmate.sh +++ b/scripts/pack_dashmate.sh @@ -25,7 +25,7 @@ ROOT_PATH=$(dirname "$DIR_PATH") cd $ROOT_PATH/packages/dashmate || exit 1 yarn pack --install-if-needed tar zxvf package.tgz -C . -cd package || exit 1 +cd $ROOT_PATH/packages/dashmate/package || exit 1 cp $ROOT_PATH/yarn.lock ./yarn.lock mkdir .yarn echo "nodeLinker: node-modules" > .yarnrc.yml