diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index be3c06e1..ed717ef6 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -34,7 +34,7 @@ steps: sg release run test --workdir=. --config-from-commit - label: "(promote) Release: test" - if: build.branch =~ /^promote\/release-.*/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | @@ -57,7 +57,7 @@ steps: sg release run internal finalize --workdir=. --config-from-commit - label: "(promote) Release: finalize" - if: build.branch =~ /^promote\/release-.*/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | diff --git a/release.yaml b/release.yaml index ae50d7c6..8aebbbb8 100644 --- a/release.yaml +++ b/release.yaml @@ -389,72 +389,3 @@ promoteToPublic: echo "Build created, see:" echo $body | jq .web_url fi - - - name: "update main with latest version" - cmd: | - set -eu - branch="promote/release-{{version}}-update-main" - echo "Checking out origin/main" - git fetch origin main - git switch main - echo "Creating branch origin/${branch}" - git switch -c "${branch}" - - - name: "sg ops" - cmd: | - set -eu - sg ops update-images \ - --kind k8s \ - --registry index.docker.io/sourcegraph \ - --docker-username=$DOCKER_USERNAME \ - --docker-password=$DOCKER_PASSWORD \ - --pin-tag {{inputs.server.tag}} \ - base/ - - - name: "sg ops (executors)" - cmd: | - set -eu - sg ops update-images \ - --kind k8s \ - --registry index.docker.io/sourcegraph \ - --docker-username=$DOCKER_USERNAME \ - --docker-password=$DOCKER_PASSWORD \ - --pin-tag {{inputs.server.tag}} \ - components/executors/ - - - name: "sg ops (migrator)" - cmd: | - set -eu - sg ops update-images \ - --kind k8s \ - --registry index.docker.io/sourcegraph \ - --docker-username=$DOCKER_USERNAME \ - --docker-password=$DOCKER_PASSWORD \ - --pin-tag {{inputs.server.tag}} \ - components/utils/migrator/ - - - name: "git:commit" - cmd: | - set -eu - branch="promote/release-{{version}}-update-main" - find . -name "*.yaml" | xargs git add - find . -name "*.yml" | xargs git add - - # Careful with the quoting for the config, using double quotes will lead - # to the shell dropping out all quotes from the json, leading to failed - # parsing. - git commit -am 'update-main: {{version}}' -m 'update main with latest release' - git push origin "${branch}" - - - name: "github:pr" - cmd: | - set -eu - # Create PR to merge release updates into main branch - gh pr create \ - --fill \ - --draft \ - --base main \ - --title "Update main: build {{version}}" \ - --body "Test plan: automated release PR, CI will perform additional checks" - echo "🚢 Please check the associated CI build to ensure the process completed". -