diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index d8006e2e..ea77e63d 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -48,7 +48,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: | @@ -71,7 +71,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 45107dcb..f633417f 100644 --- a/release.yaml +++ b/release.yaml @@ -516,100 +516,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:sourcegraph - cmd: | - set -eu - registry=index.docker.io/sourcegraph - sg ops update-images \ - -t {{inputs.server.tag}} \ - -k helm \ - --registry "${registry}" \ - --docker-username $DOCKER_USERNAME \ - --docker-password $DOCKER_PASSWORD \ - charts/sourcegraph/ - - - name: sg ops:dind - cmd: | - set -eu - registry=index.docker.io/sourcegraph - sg ops update-images \ - -t {{inputs.server.tag}} \ - -k helm \ - --registry "${registry}" \ - --docker-username $DOCKER_USERNAME \ - --docker-password $DOCKER_PASSWORD \ - charts/sourcegraph-executor/dind/ - - - name: sg ops:k8s - cmd: | - set -eu - registry=index.docker.io/sourcegraph - sg ops update-images \ - -t {{inputs.server.tag}} \ - -k helm \ - --registry "${registry}" \ - --docker-username $DOCKER_USERNAME \ - --docker-password $DOCKER_PASSWORD \ - charts/sourcegraph-executor/k8s/ - - - name: sg ops:migrator - cmd: | - set -eu - registry=index.docker.io/sourcegraph - sg ops update-images \ - -t {{inputs.server.tag}} \ - -k helm \ - --registry "${registry}" \ - --docker-username $DOCKER_USERNAME \ - --docker-password $DOCKER_PASSWORD \ - charts/sourcegraph-migrator/ - - - name: "chart:version" - cmd: | - comby -matcher ".generic" -in-place "version: \":[~\d+\.\d+\.\d+]\"" 'version: "{{inputs.server.tag}}"' -f charts/sourcegraph/Chart.yaml - comby -matcher ".generic" -in-place "version: \":[~\d+\.\d+\.\d+]\"" 'version: "{{inputs.server.tag}}"' -f charts/sourcegraph/examples/subchart/Chart.yaml - comby -matcher ".generic" -in-place "version: \":[~\d+\.\d+\.\d+]\"" 'version: "{{inputs.server.tag}}"' -f charts/sourcegraph-executor/dind/Chart.yaml - comby -matcher ".generic" -in-place "version: \":[~\d+\.\d+\.\d+]\"" 'version: "{{inputs.server.tag}}"' -f charts/sourcegraph-executor/k8s/Chart.yaml - comby -matcher ".generic" -in-place "version: \":[~\d+\.\d+\.\d+]\"" 'version: "{{inputs.server.tag}}"' -f charts/sourcegraph-migrator/Chart.yaml - - - name: "chart:appVersion" - cmd: | - comby -matcher ".generic" -in-place "appVersion: \":[~\d+\.\d+\.\d+]\"" 'appVersion: "{{inputs.server.tag}}"' -f charts/sourcegraph/Chart.yaml - comby -matcher ".generic" -in-place "appVersion: \":[~\d+\.\d+\.\d+]\"" 'appVersion: "{{inputs.server.tag}}"' -f charts/sourcegraph-executor/dind/Chart.yaml - comby -matcher ".generic" -in-place "appVersion: \":[~\d+\.\d+\.\d+]\"" 'appVersion: "{{inputs.server.tag}}"' -f charts/sourcegraph-executor/k8s/Chart.yaml - comby -matcher ".generic" -in-place "appVersion: \":[~\d+\.\d+\.\d+]\"" 'appVersion: "{{inputs.server.tag}}"' -f charts/sourcegraph-migrator/Chart.yaml - - - name: "update helm docs" - cmd: ./scripts/helm-docs.sh - - - name: "git:commit" - cmd: | - set -eu - branch="promote/release-{{version}}-update-main" - - git commit -am "prep 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". -