From 94101a0b9306a0a226714f980f9fd239e295990d Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 20 Dec 2022 18:29:41 -0500 Subject: [PATCH] fix picking artifact location in bottle.yml --- .github/workflows/bottle.yml | 12 +++++++++--- .github/workflows/new-version.yml | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index 88419712..d86985f8 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -1,6 +1,12 @@ name: bottle -on: workflow_call +on: + workflow_call: + inputs: + new-version: + type: boolean + required: false + default: false jobs: bottle: @@ -46,13 +52,13 @@ jobs: fi - uses: actions/download-artifact@v3 - if: ${{ !startsWith(github.ref, 'refs/pull/')}} + if: ${{ inputs.new-version }} with: name: ${{ matrix.platform.name }} path: tea.xyz/var/pantry - run: scripts/fetch-pr-artifacts.ts ${{ github.repository }} ${{ github.sha }} ${{ matrix.platform.name }} - if: startsWith(github.ref, 'refs/pull/') + if: ${{ !inputs.new-version }} env: GITHUB_TOKEN: ${{github.token}} AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }} diff --git a/.github/workflows/new-version.yml b/.github/workflows/new-version.yml index ab186e1a..fc2ac3c9 100644 --- a/.github/workflows/new-version.yml +++ b/.github/workflows/new-version.yml @@ -17,4 +17,6 @@ jobs: bottle: needs: [build] uses: ./.github/workflows/bottle.yml + with: + new-version: true secrets: inherit