diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml deleted file mode 100644 index 981a5ad40..000000000 --- a/.github/workflows/docker-release.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Docker Release - -on: - release: - types: [released] - -jobs: - trigger-build: - uses: ./.github/workflows/docker.yml - with: - tag: ${{ github.event.release.tag_name }} - secrets: inherit - upload-docker: - needs: trigger-build - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - name: Upload binary to existing release - run: make zip_linux_release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/plugins-release.yml b/.github/workflows/release.yml similarity index 64% rename from .github/workflows/plugins-release.yml rename to .github/workflows/release.yml index fd2f6b570..847357b4a 100644 --- a/.github/workflows/plugins-release.yml +++ b/.github/workflows/release.yml @@ -1,11 +1,11 @@ -name: Plugins Release +name: Release on: release: types: [released] jobs: - dispatch: + dispatch-plugins: runs-on: ubuntu-latest steps: - name: Checkout repository @@ -25,3 +25,17 @@ jobs: "tag": "${{ github.ref_name }}", "checksum": "${{ steps.parse_checksum.outputs.checksum }}" } + trigger-docker: + uses: ./.github/workflows/docker.yml + with: + tag: ${{ github.event.release.tag_name }} + secrets: inherit + upload-docker: + needs: trigger-docker + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v4 + - name: Upload binary to existing release + run: make zip_linux_release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}