From b73d4e51cefb9d857c6fbd37c43d258b2992d284 Mon Sep 17 00:00:00 2001 From: "Ross Buggins (NHS)" Date: Wed, 26 Jun 2024 19:27:18 +0000 Subject: [PATCH] ukmmmm --- .github/workflows/cicd-1-pull-request.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml index 6143a4c..d950bd9 100644 --- a/.github/workflows/cicd-1-pull-request.yaml +++ b/.github/workflows/cicd-1-pull-request.yaml @@ -70,6 +70,7 @@ jobs: export TERRAFORM_VERSION="${{ steps.variables.outputs.terraform_version }}" export VERSION="${{ steps.variables.outputs.version }}" export DOES_PULL_REQUEST_EXIST="${{ steps.pr_exists.outputs.does_pull_request_exist }}" + export IS_VERSION_PRERELEASE="${{ steps.pr_exists.outputs.is_version_prerelease }}" make list-variables commit-stage: # Recommended maximum execution time is 2 minutes name: "Commit stage" @@ -129,7 +130,7 @@ jobs: name: "Publish stage" needs: [metadata, acceptance-stage] uses: ./.github/workflows/stage-5-publish.yaml - if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event.action == 'push' && github.ref == 'refs/heads/main') + if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'push' && github.ref == 'refs/heads/main') with: build_datetime: "${{ needs.metadata.outputs.build_datetime }}" build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"