diff options
| author | swati keshari <swatikeshari4@gmail.com> | 2021-09-07 19:59:19 +0530 |
|---|---|---|
| committer | swati keshari <swatikeshari4@gmail.com> | 2021-09-08 18:54:47 +0530 |
| commit | 8245e6183bfe55f606fd603c26bd3bb6154e9222 (patch) | |
| tree | 2ecacc496be2a1ffd3a040d4419ef2680d18cd28 | |
| parent | 4003980ebf5a028c4e607490fd77ccb2bcc5f0c2 (diff) | |
| download | chef-skeshari/bundler_deprecated_warning.tar.gz | |
Replace master with main branchskeshari/bundler_deprecated_warning
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
Replace master with main branch
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
Replace master with main branch
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
Replace master with main branch
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
Fix build failure
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
Fix build failure
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
| -rw-r--r-- | .buildkite/hooks/pre-command | 10 | ||||
| -rw-r--r-- | omnibus/Gemfile | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 6f9dcecdf6..909610543c 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -11,8 +11,8 @@ free -m || true # We've now seen cases where origin/master on the build hosts can get # out of date. This causes us to build components unnecessarily. # Fetching it here hopefully will prevent this situation. -echo "Fetching origin/master" -git fetch origin master +echo "Fetching origin/main" +git fetch origin main # DEBUGGING FOR RELENG # Fetch the git tags to see if that addresses the weird smart build behavior for Habitat @@ -21,13 +21,13 @@ git fetch --tags --force # Rebase onto current master to ensure this PR is closer to what happens when it's merged. # Only do this if it's actually a branch (i.e. a PR or a manually created build), not a # post-merge CI run of master. -if [[ "$BUILDKITE_BRANCH" != "master" ]]; then +if [[ "$BUILDKITE_BRANCH" != "main" ]]; then git config user.email "you@example.com" # these are needed for the rebase attempt git config user.name "Your Name" - master=$(git show-ref -s --abbrev origin/master) + master=$(git show-ref -s --abbrev origin/main) pr_head=$(git show-ref -s --abbrev HEAD) github="https://github.com/chef/chef/commit/" - if git rebase origin/master >/dev/null; then + if git rebase origin/main >/dev/null; then buildkite-agent annotate --style success --context "rebase-pr-branch-${master}" \ "Rebased onto master ([${master}](${github}${master}))." else diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 052ac6bfd9..10acd55554 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "master") -gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "master") +gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") +gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") gem "artifactory" gem "pedump" |