diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml index 5060156114b..88cb606a194 100644 --- a/.github/workflows/version-auto-bump.yml +++ b/.github/workflows/version-auto-bump.yml @@ -44,27 +44,10 @@ jobs: needs: - setup steps: - - name: Login to Azure - uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010 + - name: Bump version to ${{ needs.setup.outputs.version_number }} + uses: ./.github/workflows/version-bump.yml + secrets: + AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} with: - creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} - - - name: Retrieve secrets - id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af - with: - keyvault: "bitwarden-prod-kv" - secrets: "github-pat-bitwarden-devops-bot-repo-scope" - - - name: Call GitHub API to trigger workflow bump - env: - TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} - VERSION: ${{ needs.setup.outputs.version_number}} - run: | - JSON_STRING=$(printf '{"ref":"master", "inputs": { "client":"Desktop", "version_number":"%s"}}' "$VERSION") - curl \ - -X POST \ - -i -u bitwarden-devops-bot:$TOKEN \ - -H "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/bitwarden/clients/actions/workflows/version-bump.yml/dispatches \ - -d $JSON_STRING + version_number: ${{ needs.setup.outputs.version_number }} + client: "Desktop" diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 0bb9378d502..6d3bd96ea11 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -18,6 +18,18 @@ on: description: "New Version" required: true + workflow_call: + inputs: + version_number: + required: true + type: string + client: + required: true + type: string + secrets: + AZURE_PROD_KV_CREDENTIALS: + required: true + defaults: run: shell: bash