From 2c1517a9a3dd584965dd2da07a4c6a9fede4019f Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:15:02 -0800 Subject: [PATCH] Don't bother --- .github/workflows/dev-to-stage.yml | 14 +------------- .github/workflows/merge-to-dev.yml | 24 ------------------------ .github/workflows/stage-tests.yml | 1 + .github/workflows/test-server-rc.yml | 4 +--- 4 files changed, 3 insertions(+), 40 deletions(-) diff --git a/.github/workflows/dev-to-stage.yml b/.github/workflows/dev-to-stage.yml index 00f0e3b0a..f9954764d 100644 --- a/.github/workflows/dev-to-stage.yml +++ b/.github/workflows/dev-to-stage.yml @@ -8,17 +8,6 @@ on: # This is to make sure this workflow doesn't get triggered after a bump commit tags-ignore: - '*rc*' - workflow_dispatch: - inputs: - # For creating a backport client version - server-tag: - required: true - default: 'latest' - description: 'Server docker image tag' - use-server-rc: - required: true - default: false - type: boolean jobs: promote-dev-build-to-rc: @@ -32,8 +21,7 @@ jobs: needs: promote-dev-build-to-rc uses: ./.github/workflows/stage-tests.yml with: - server-tag: ${{ github.event_name == 'workflow_dispatch' && inputs.server-tag || 'latest' }} - use-server-rc: ${{ github.event_name == 'workflow_dispatch' && inputs.use-server-rc || false }} + use-server-rc: false commit_sha: ${{ needs.promote-dev-build-to-rc.outputs.bump_sha }} secrets: inherit diff --git a/.github/workflows/merge-to-dev.yml b/.github/workflows/merge-to-dev.yml index 5486af5a5..add80b821 100644 --- a/.github/workflows/merge-to-dev.yml +++ b/.github/workflows/merge-to-dev.yml @@ -6,27 +6,6 @@ on: - closed branches: - 'dev' - workflow_dispatch: - inputs: - # Disable this to skip testing the wheel right after building it - # This is useful if we need to debug later parts of the pipeline - run_server_release_tests: - description: "Run server release tests" - required: true - type: boolean - default: true - # Override the default server version to test against - # This is helpful if you need to create a backport from an older client major version - # And that older client major version does not accomodate for breaking changes in the latest server version - server-release-tag: - required: true - default: 'latest' - description: 'Server release docker image tag' - # In case the latest server RC is faulty for some reason - server-rc-tag: - required: true - default: 'latest' - description: 'Server RC docker image tag' jobs: bump-dev-number: @@ -42,8 +21,6 @@ jobs: needs: bump-dev-number uses: ./.github/workflows/build-wheels.yml with: - server-tag: ${{ github.event_name == 'workflow_dispatch' && inputs.server-release-tag || 'latest' }} - run_tests: ${{ github.event_name == 'workflow_dispatch' && inputs.run_server_release_tests || true }} commit_sha: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: DOCKER_HUB_BOT_USERNAME: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} @@ -72,7 +49,6 @@ jobs: ] uses: ./.github/workflows/test-server-rc.yml with: - server-tag: ${{ github.event_name == 'workflow_dispatch' && inputs.server-rc-tag || 'latest' }} build-number: ${{ needs.bump-dev-number.outputs.new_version }} commit_sha: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: diff --git a/.github/workflows/stage-tests.yml b/.github/workflows/stage-tests.yml index 7c900dbc0..d02a5bd06 100644 --- a/.github/workflows/stage-tests.yml +++ b/.github/workflows/stage-tests.yml @@ -18,6 +18,7 @@ on: commit_sha: type: string required: true + # Default values for workflow_call to use use-server-rc: type: boolean required: false diff --git a/.github/workflows/test-server-rc.yml b/.github/workflows/test-server-rc.yml index c62e20c8f..c9e6ec7f8 100644 --- a/.github/workflows/test-server-rc.yml +++ b/.github/workflows/test-server-rc.yml @@ -7,9 +7,7 @@ on: commit_sha: type: string required: false - # Override the default server version to test against - # This is helpful if you need to create a backport from an older client major version - # And that older client major version does not accomodate for breaking changes in the latest server version + # TODO: Not using the following secrets for workflow_call server-tag: type: string required: false