Merge pull request #9562 from adamreese/fix/ci-main

fix(ci) update ci to use main branch
pull/9577/head
Adam Reese 4 years ago committed by GitHub
commit a499b4b179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -26,7 +26,7 @@ fi
VERSION= VERSION=
if [[ -n "${CIRCLE_TAG:-}" ]]; then if [[ -n "${CIRCLE_TAG:-}" ]]; then
VERSION="${CIRCLE_TAG}" VERSION="${CIRCLE_TAG}"
elif [[ "${CIRCLE_BRANCH:-}" == "master" ]]; then elif [[ "${CIRCLE_BRANCH:-}" == "main" ]]; then
VERSION="canary" VERSION="canary"
else else
echo "Skipping deploy step; this is neither a releasable branch or a tag" echo "Skipping deploy step; this is neither a releasable branch or a tag"

@ -162,7 +162,7 @@ type SQLReleaseWrapper struct {
// The primary key, made of {release-name}.{release-version} // The primary key, made of {release-name}.{release-version}
Key string `db:"key"` Key string `db:"key"`
// See https://github.com/helm/helm/blob/master/pkg/storage/driver/secrets.go#L236 // See https://github.com/helm/helm/blob/c9fe3d118caec699eb2565df9838673af379ce12/pkg/storage/driver/secrets.go#L231
Type string `db:"type"` Type string `db:"type"`
// The rspb.Release body, as a base64-encoded string // The rspb.Release body, as a base64-encoded string

Loading…
Cancel
Save