diff --git a/.github/workflows/build-api-image.yml b/.github/workflows/build-api-image.yml deleted file mode 100644 index 2edfdb32..00000000 --- a/.github/workflows/build-api-image.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Build API Image - -on: - push: - tags: - - 'console-api/v*' - -concurrency: - group: ${{ github.workflow }} - -jobs: - build: - name: Build Docker image - uses: ./.github/workflows/build-image.yml - secrets: inherit - with: - tag: ${{ github.event.ref }} diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml index b151b1fc..61743769 100644 --- a/.github/workflows/create-github-release.yml +++ b/.github/workflows/create-github-release.yml @@ -7,6 +7,10 @@ on: description: 'The app to release' required: true type: string + outputs: + version: + description: 'The version released' + value: ${{ jobs.release.outputs.version }} concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.app }} @@ -20,6 +24,9 @@ jobs: name: Create GitHub Release runs-on: ubuntu-latest + outputs: + version: ${{ steps.bumps.outputs.version }} + steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/create-console-api-github-release.yml b/.github/workflows/release-api.yml similarity index 52% rename from .github/workflows/create-console-api-github-release.yml rename to .github/workflows/release-api.yml index 6b43ef7f..f08b7602 100644 --- a/.github/workflows/create-console-api-github-release.yml +++ b/.github/workflows/release-api.yml @@ -1,4 +1,4 @@ -name: Create Console API GitHub Release +name: Release API on: push: @@ -16,4 +16,12 @@ jobs: uses: ./.github/workflows/create-github-release.yml secrets: inherit with: - app: api \ No newline at end of file + app: api + + build: + needs: release + name: Build Docker image + uses: ./.github/workflows/build-image.yml + secrets: inherit + with: + tag: ${{ needs.release.outputs.version }} \ No newline at end of file