primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 08:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switching to using the main default branch (#1628)

Browse Source 
* Switching to using the main default branch

* changing links to main branch, not master branch

* Changing a few links to relative

* Bumping chart version

Co-authored-by: Marwan Sulaiman <marwan.sameer@gmail.com>
This commit is contained in:
Aaron Schlesinger
2020-06-15 13:44:37 -07:00
committed by GitHub
parent f01c645305
commit c2c5daf61a
25 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/check_conflicts.sh
+3 -3
View File
@@ -10,13 +10,13 @@
# the script will exit with code 1 on finding any matches, causing the
# CI build to fail. Merge conflict artifacts must be removed before continuing.
git remote set-branches --add origin master && git fetch
COUNT=$(git diff origin/master -- . ':!*.go' ':!go.mod' ':!go.sum' | grep -Ec "^\+[<>=]{7}\w{0,}")
git remote set-branches --add origin main && git fetch
COUNT=$(git diff origin/main -- . ':!*.go' ':!go.mod' ':!go.sum' | grep -Ec "^\+[<>=]{7}\w{0,}")
if (($COUNT > 0));then
echo "************************************************************"
echo "The following files contained merge conflict artifacts:\n"
exec git diff --name-only -G'^[<>=]{7}\w?' origin/master -- . ':!*.go' ':!go.mod' ':!go.sum'
exec git diff --name-only -G'^[<>=]{7}\w?' origin/main -- . ':!*.go' ':!go.mod' ':!go.sum'
echo "************************************************************"
exit 1
fi
scripts/check_deps.sh
+2 -2
View File
@@ -11,8 +11,8 @@
# before a pull request can be merged.
set -xeuo pipefail
git remote set-branches --add origin master && git fetch
ChangedFiles=`git diff --name-only origin/master`
git remote set-branches --add origin main && git fetch
ChangedFiles=`git diff --name-only origin/main`
# in the case that ChangedFiles contains go.mod or go.sum run go mod verify
case "$ChangedFiles" in
scripts/ps/check_deps.ps1
+2 -2
View File
@@ -7,8 +7,8 @@
# to check for any conflicts in versions or digests
# which on any exit code > 0 would suggest that action should be taken
# before a pull request can be merged.
git remote set-branches --add origin master ; git fetch
$ChangedFiles=$(git diff --name-only origin/master)
git remote set-branches --add origin main ; git fetch
$ChangedFiles=$(git diff --name-only origin/main)
# in the case that ChangedFiles contains go.mod or go.sum run go mod verify
$contains= $ChangedFiles | Select-String -Pattern "go.mod|go.sum"
scripts/push-docker-images.sh
+2 -2
View File
@@ -14,8 +14,8 @@ if [[ "${MUTABLE_TAG:-}" == "" ]]; then
# tagged builds
if [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
MUTABLE_TAG="latest"
# master build
elif [[ "$BRANCH" == "master" ]]; then
# main branch build
elif [[ "$BRANCH" == "main" ]]; then
MUTABLE_TAG="canary"
# branch build
else