From 734f93b2451207f613b032e03c32663a3feea516 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Tue, 30 Mar 2021 17:59:43 +0100 Subject: [PATCH] Update references to default branch name as it has changed to main Signed-off-by: Martin Hickey --- .github/pull_request_template.md | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- scripts/get-helm-3 | 4 ++-- scripts/release-notes.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 595b50218..cda9086dd 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ **What this PR does / why we need it**: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d2babcc38..71d562727 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '29 6 * * 6' diff --git a/scripts/get-helm-3 b/scripts/get-helm-3 index 90f103451..cf76cd9d8 100755 --- a/scripts/get-helm-3 +++ b/scripts/get-helm-3 @@ -185,13 +185,13 @@ verifyChecksum() { echo "Done." } -# verifySignatures obtains the latest KEYS file from GitHub master branch +# verifySignatures obtains the latest KEYS file from GitHub main branch # as well as the signature .asc files from the specific GitHub release, # then verifies that the release artifacts were signed by a maintainer's key. verifySignatures() { printf "Verifying signatures... " local keys_filename="KEYS" - local github_keys_url="https://raw.githubusercontent.com/helm/helm/master/${keys_filename}" + local github_keys_url="https://raw.githubusercontent.com/helm/helm/main/${keys_filename}" if [ "${HAS_CURL}" == "true" ]; then curl -SsL "${github_keys_url}" -o "${HELM_TMP_ROOT}/${keys_filename}" elif [ "${HAS_WGET}" == "true" ]; then diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 0f6ab4167..d0dcca8ca 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -91,7 +91,7 @@ Download Helm ${RELEASE}. The common platform binaries are here: - [Linux s390x](https://get.helm.sh/helm-${RELEASE}-linux-s390x.tar.gz) ([checksum](https://get.helm.sh/helm-${RELEASE}-linux-s390x.tar.gz.sha256sum) / $(cat _dist/helm-${RELEASE}-linux-s390x.tar.gz.sha256)) - [Windows amd64](https://get.helm.sh/helm-${RELEASE}-windows-amd64.zip) ([checksum](https://get.helm.sh/helm-${RELEASE}-windows-amd64.zip.sha256sum) / $(cat _dist/helm-${RELEASE}-windows-amd64.zip.sha256)) -The [Quickstart Guide](https://helm.sh/docs/intro/quickstart/) will get you going from there. For **upgrade instructions** or detailed installation notes, check the [install guide](https://helm.sh/docs/intro/install/). You can also use a [script to install](https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3) on any system with \`bash\`. +The [Quickstart Guide](https://helm.sh/docs/intro/quickstart/) will get you going from there. For **upgrade instructions** or detailed installation notes, check the [install guide](https://helm.sh/docs/intro/install/). You can also use a [script to install](https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3) on any system with \`bash\`. ## What's Next