chore(ci): dont upgrade yarn unexpectedly

Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Nov 7, 2024 · be6034d · be6034d
1 parent cf99b7e
commit be6034d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 37 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -20,7 +20,6 @@ concurrency:
 
 env:
   NODE_ACTIVE_LTS: '20'  # https://nodejs.org/en/about/releases/
-  YARN_VERSION: '4.x'  # https://yarnpkg.com/blog/
   BUNDLES_DIR: bundles
   DIST_DIR: dist
   REPORTS_DIR: "CI_reports"
@@ -44,10 +43,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: |
           yarn install --no-immutable
@@ -98,10 +95,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: |
           yarn install --no-immutable
@@ -143,10 +138,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: |
           yarn install --no-immutable
@@ -179,10 +172,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: yarn install --immutable
       - name: fetch build artifact
@@ -242,10 +233,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: yarn install --immutable
       - name: setup-tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,6 @@ env:
   DIST_DIR: dist
   PACKED_DIR: CI_packed
   NODE_ACTIVE_LTS: "20"  # https://nodejs.org/en/about/releases/
-  YARN_VERSION: '4.x'  # https://yarnpkg.com/blog/
 
 jobs:
   bump:
@@ -99,11 +98,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
           # cache: 'yarn'
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          set -eux
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: |
           yarn install --no-immutable
@@ -172,11 +168,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          set -eux
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: Setup subject
         run: |
           yarn install --no-immutable
@@ -214,11 +207,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_ACTIVE_LTS }}
-      - name: Setup yarn ${{ env.YARN_VERSION }}
-        run: |
-          set -eux
-          corepack enable yarn
-          yarn set version "$YARN_VERSION"
+      - name: Setup yarn
+        run: corepack enable yarn
       - name: make lock
         # for stupid reasons `yarn publish` requires a lockfile
         run: |