forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ci] Fix yarn-offline-mirror (elastic#196224)
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
Showing
2 changed files
with
4 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|