diff --git a/.github/workflows/pull-request-verify.yml b/.github/workflows/pull-request-verify.yml index f3bfc98..0e12ece 100644 --- a/.github/workflows/pull-request-verify.yml +++ b/.github/workflows/pull-request-verify.yml @@ -4,32 +4,39 @@ on: pull_request: jobs: - read-version: + read-versions: runs-on: ubuntu-latest outputs: - snapshot-version: ${{ steps.check-version-change.outputs.snapshot-version }} - release-version: ${{ steps.check-version-change.outputs.snapshot-version }} + release-version: ${{ steps.read-apiman-versions.outputs.release-version }} + snapshot-version: ${{ steps.read-apiman-versions.outputs.snapshot-version }} steps: + - name: Checkout Apiman Docker repo + uses: actions/checkout@v3 + + - name: Default setup items + run: bash .github/workflows/support/setup.sh + - name: "Get release and snapshot versions..." + id: read-apiman-versions run: | - echo "{release_version=$(cat .github/workflows/RELEASE_VERSION)}" >> $GITHUB_ENV - echo "{snapshot_version=$(cat .github/workflows/SNAPSHOT_VERSION)}" >> $GITHUB_ENV + echo "{release-version=$(cat .github/workflows/RELEASE_VERSION)}" >> $GITHUB_ENV + echo "{snapshot-version=$(cat .github/workflows/SNAPSHOT_VERSION)}" >> $GITHUB_ENV build-against-release: - needs: read-version + needs: read-versions uses: apiman/apiman-docker/.github/workflows/docker-test-release.yml@master secrets: inherit with: - apiman-version: ${{ needs.read-version.outputs.release-version }} + apiman-version: ${{ needs.read-versions.outputs.release-version }} push-to-repos: false snapshot: false build-against-snapshot: - needs: read-version + needs: read-versions uses: apiman/apiman-docker/.github/workflows/docker-test-release.yml@master secrets: inherit with: - apiman-version: ${{ needs.read-version.outputs.snapshot-version }} + apiman-version: ${{ needs.read-versions.outputs.snapshot-version }} push-to-repos: false snapshot: true diff --git a/.github/workflows/receive-dispatch-update-release-version.yml b/.github/workflows/receive-dispatch-update-release-version.yml index 088f38a..9260389 100644 --- a/.github/workflows/receive-dispatch-update-release-version.yml +++ b/.github/workflows/receive-dispatch-update-release-version.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v3 - name: Default setup items - run: bash .git/workflows/support/setup.sh + run: bash .github/workflows/support/setup.sh - name: Update release version in docker-release flow run: echo ${{ github.event.client_payload.release-version }} > .github/workflows/RELEASE_VERSION