Skip to content

Commit

Permalink
[ci] Fix yarn-offline-mirror (elastic#196224)
Browse files Browse the repository at this point in the history
Currently CI is configuring a yarn offline mirror outside of the Kibana
directory, with the intention of caching assets during image build. This
configuration is ignored due to .yarnrc taking precedence, resulting in
the offline mirror being setup in the local Kibana installation. On CI
start, a fresh checkout of the repository is made and the cache
directory is empty.

Instead of setting a user level configuration this modifies .yarnrc with
the intended directory.

(cherry picked from commit f793c3b)
  • Loading branch information
jbudz committed Oct 21, 2024
1 parent 392c4f2 commit fc88724
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .buildkite/scripts/common/setup_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ if [[ ! $(which yarn) || $(yarn --version) != "$YARN_VERSION" ]]; then
npm_install_global yarn "^$YARN_VERSION"
fi

yarn config set yarn-offline-mirror "$YARN_OFFLINE_CACHE"
grep -q 'yarn-offline-mirror ".yarn-local-mirror"' .yarnrc
sed -i "s#.yarn-local-mirror#$YARN_OFFLINE_CACHE#" .yarnrc

YARN_GLOBAL_BIN=$(yarn global bin)
export YARN_GLOBAL_BIN
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/scripts/common/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ check_for_changed_files() {

SHOULD_AUTO_COMMIT_CHANGES="${2:-}"
CUSTOM_FIX_MESSAGE="${3:-}"
GIT_CHANGES="$(git status --porcelain -- . ':!:.bazelrc' ':!:config/node.options' ':!config/kibana.yml')"
GIT_CHANGES="$(git status --porcelain -- . ':!:.bazelrc' ':!:.yarnrc' ':!:config/node.options' ':!config/kibana.yml')"

if [ "$GIT_CHANGES" ]; then
if ! is_auto_commit_disabled && [[ "$SHOULD_AUTO_COMMIT_CHANGES" == "true" && "${BUILDKITE_PULL_REQUEST:-false}" != "false" ]]; then
Expand All @@ -56,7 +56,7 @@ check_for_changed_files() {
git config --global user.name kibanamachine
git config --global user.email '[email protected]'
gh pr checkout "${BUILDKITE_PULL_REQUEST}"
git add -A -- . ':!.bazelrc' ':!WORKSPACE.bazel' ':!config/node.options' ':!config/kibana.yml'
git add -A -- . ':!.bazelrc' ':!.yarnrc' ':!WORKSPACE.bazel' ':!config/node.options' ':!config/kibana.yml'

git commit -m "$NEW_COMMIT_MESSAGE"
git push
Expand Down

0 comments on commit fc88724

Please sign in to comment.