Skip to content

Commit 6b5afc0

Browse files
committed
Fix CI yarn-berry PATH setup
1 parent e85c741 commit 6b5afc0

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/tests.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,16 @@ jobs:
133133
YARN_BERRY_PREFIX="/usr/local/yarn-berry"
134134
YARN_BERRY_ALIAS="/usr/local/bin/yarn-berry"
135135
fi
136+
YARN_BERRY_ALIAS_DIR="$(dirname "$YARN_BERRY_ALIAS")"
137+
mkdir -p "$YARN_BERRY_ALIAS_DIR"
138+
export PATH="$YARN_BERRY_ALIAS_DIR:$PATH"
139+
echo "$YARN_BERRY_ALIAS_DIR" >> "$GITHUB_PATH"
136140
npm install --prefix "$YARN_BERRY_PREFIX" @yarnpkg/cli-dist@4.13.0
137141
ln -sf "$YARN_BERRY_PREFIX/node_modules/.bin/yarn" "$YARN_BERRY_ALIAS"
138142
"$YARN_BERRY_ALIAS" --version | grep -q '^4\.'
139-
which yarn
143+
command -v yarn
140144
yarn --version
141-
which yarn-berry
145+
command -v yarn-berry
142146
yarn-berry --version
143147
yarn --version | grep -q '^1\.' || { echo "ERROR: yarn is not 1.x"; exit 1; }
144148
@@ -303,12 +307,16 @@ jobs:
303307
YARN_BERRY_PREFIX="/usr/local/yarn-berry"
304308
YARN_BERRY_ALIAS="/usr/local/bin/yarn-berry"
305309
fi
310+
YARN_BERRY_ALIAS_DIR="$(dirname "$YARN_BERRY_ALIAS")"
311+
mkdir -p "$YARN_BERRY_ALIAS_DIR"
312+
export PATH="$YARN_BERRY_ALIAS_DIR:$PATH"
313+
echo "$YARN_BERRY_ALIAS_DIR" >> "$GITHUB_PATH"
306314
npm install --prefix "$YARN_BERRY_PREFIX" @yarnpkg/cli-dist@4.13.0
307315
ln -sf "$YARN_BERRY_PREFIX/node_modules/.bin/yarn" "$YARN_BERRY_ALIAS"
308316
"$YARN_BERRY_ALIAS" --version | grep -q '^4\.'
309-
which yarn
317+
command -v yarn
310318
yarn --version
311-
which yarn-berry
319+
command -v yarn-berry
312320
yarn-berry --version
313321
yarn --version | grep -q '^1\.' || { echo "ERROR: yarn is not 1.x"; exit 1; }
314322

0 commit comments

Comments
 (0)