From ddd94a70307cec63db669df7e167795487d234cf Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Mon, 3 Mar 2025 15:45:25 -0800 Subject: [PATCH] /.github/workflows: publish prerelease until docker job finishes --- .github/workflows/cd-push-docker-image.yaml | 25 +++++++++++++++++++++ .github/workflows/cd-release-pgo.yaml | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-push-docker-image.yaml b/.github/workflows/cd-push-docker-image.yaml index 2003a8d295..25cfb13a4a 100644 --- a/.github/workflows/cd-push-docker-image.yaml +++ b/.github/workflows/cd-push-docker-image.yaml @@ -10,8 +10,27 @@ on: types: [ push-docker-image ] jobs: + get-release-id: + name: Get Dolt Release Id + runs-on: ubuntu-22.04 + outputs: + release_id: ${{ steps.get_release.outputs.release_id }} + steps: + - name: Get Release + id: get_release + run: | + release_id="$RELEASE_ID" + if [ "$EVENT_TYPE" == "workflow_dispatch" ]; then + release_id=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/dolthub/dolt/releases/tags/v${{ github.event.inputs.version }} | jq '.id') + fi + echo "release_id=$release_id" >> $GITHUB_OUTPUT + env: + EVENT_TYPE: ${{ github.event_name }} + RELEASE_ID: ${{ github.event.client_payload.release_id }} + docker-image-push: name: Push Docker Image + needs: get-release-id runs-on: ubuntu-22.04 steps: - name: Checkout @@ -61,3 +80,9 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} repository: dolthub/dolt-sql-server readme-filepath: ./docker/serverREADME.md + - name: Edit Release + uses: irongut/EditRelease@v1.2.0 + with: + token: ${{ secrets.REPO_ACCESS_TOKEN || secrets.GITHUB_TOKEN }} + id: ${{ needs.get-release-id.outputs.release_id }} + prerelease: false diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml index 1c9b59127a..27b44a87bc 100644 --- a/.github/workflows/cd-release-pgo.yaml +++ b/.github/workflows/cd-release-pgo.yaml @@ -97,7 +97,7 @@ jobs: tag_name: v${{ needs.format-version.outputs.version }} release_name: ${{ needs.format-version.outputs.version }} draft: false - prerelease: false + prerelease: true commitish: ${{ steps.build_binaries.outputs.commitish }} - name: Upload Linux AMD64 Distro id: upload-linux-amd64-distro @@ -213,4 +213,4 @@ jobs: with: token: ${{ secrets.REPO_ACCESS_TOKEN }} event-type: push-docker-image - client-payload: '{"version": "${{ needs.format-version.outputs.version }}"}' + client-payload: '{"version": "${{ needs.format-version.outputs.version }}", "release_id": "${{ needs.create-pgo-release.outputs.release_id }}" }'