From d826ad2b528565fce7df086bd7abefcfac196f88 Mon Sep 17 00:00:00 2001 From: DCamma Date: Wed, 23 Oct 2024 11:09:21 +0200 Subject: [PATCH] gh_artifact_merge_multiple_default --- .github/workflows/docker-build-push-ecr.yaml | 3 ++- .github/workflows/tf-apply.yaml | 3 ++- .github/workflows/tf-feature.yaml | 3 ++- .github/workflows/tf-plan.yaml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push-ecr.yaml b/.github/workflows/docker-build-push-ecr.yaml index 53f623e5..29da9853 100644 --- a/.github/workflows/docker-build-push-ecr.yaml +++ b/.github/workflows/docker-build-push-ecr.yaml @@ -53,6 +53,7 @@ on: artifact_merge_multiple: description: "When multiple artifacts are matched, this changes the behavior of the destination directories. If true, the downloaded artifacts will be in the same directory specified by path. If false, the downloaded artifacts will be extracted into individual named directories within the specified path. Optional. Default is 'false'." type: boolean + default: false jobs: build: runs-on: ubuntu-latest @@ -69,7 +70,7 @@ jobs: ARTIFACT_PATH: ${{ inputs.artifact_path || vars.artifact_path }} ARTIFACT_NAME: ${{ inputs.artifact_name || vars.artifact_name }} ARTIFACT_PATTERN: ${{ inputs.artifact_pattern || vars.artifact_pattern }} - ARTIFACT_MERGE_MULTIPLE: ${{ inputs.artifact_merge_multiple || vars.artifact_merge_multiple || false}} + ARTIFACT_MERGE_MULTIPLE: ${{ inputs.artifact_merge_multiple || vars.artifact_merge_multiple }} uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 if: env.ARTIFACT_PATH != '' || env.ARTIFACT_NAME != '' with: diff --git a/.github/workflows/tf-apply.yaml b/.github/workflows/tf-apply.yaml index ab6b7322..e5977557 100644 --- a/.github/workflows/tf-apply.yaml +++ b/.github/workflows/tf-apply.yaml @@ -35,6 +35,7 @@ on: gh_artifact_merge_multiple: description: "When multiple artifacts are matched, this changes the behavior of the destination directories. If true, the downloaded artifacts will be in the same directory specified by path. If false, the downloaded artifacts will be extracted into individual named directories within the specified path. Optional. Default is 'false'." type: boolean + default: false tf_dir: description: "Path to the Terraform root module to apply." type: string @@ -95,7 +96,7 @@ jobs: GH_ARTIFACT_PATH: ${{ inputs.gh_artifact_path || vars.gh_artifact_path }} GH_ARTIFACT_NAME: ${{ inputs.gh_artifact_name || vars.gh_artifact_name }} GH_ARTIFACT_PATTERN: ${{ inputs.gh_artifact_pattern || vars.gh_artifact_pattern }} - GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple || false }} + GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple }} uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 if: env.GH_ARTIFACT_PATH != '' || env.GH_ARTIFACT_NAME != '' with: diff --git a/.github/workflows/tf-feature.yaml b/.github/workflows/tf-feature.yaml index 4823da70..38a4bec2 100644 --- a/.github/workflows/tf-feature.yaml +++ b/.github/workflows/tf-feature.yaml @@ -32,6 +32,7 @@ on: gh_artifact_merge_multiple: description: "When multiple artifacts are matched, this changes the behavior of the destination directories. If true, the downloaded artifacts will be in the same directory specified by path. If false, the downloaded artifacts will be extracted into individual named directories within the specified path. Optional. Default is 'false'." type: boolean + default: false tf_dir: description: "Terraform directory" type: string @@ -101,7 +102,7 @@ jobs: GH_ARTIFACT_PATH: ${{ inputs.gh_artifact_path || vars.gh_artifact_path }} GH_ARTIFACT_NAME: ${{ inputs.gh_artifact_name || vars.gh_artifact_name }} GH_ARTIFACT_PATTERN: ${{ inputs.gh_artifact_pattern || vars.gh_artifact_pattern }} - GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple || false }} + GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple }} uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 if: env.GH_ARTIFACT_PATH != '' || env.GH_ARTIFACT_NAME != '' with: diff --git a/.github/workflows/tf-plan.yaml b/.github/workflows/tf-plan.yaml index a249e53f..bcb65ae5 100644 --- a/.github/workflows/tf-plan.yaml +++ b/.github/workflows/tf-plan.yaml @@ -37,6 +37,7 @@ on: gh_artifact_merge_multiple: description: "When multiple artifacts are matched, this changes the behavior of the destination directories. If true, the downloaded artifacts will be in the same directory specified by path. If false, the downloaded artifacts will be extracted into individual named directories within the specified path. Optional. Default is 'false'." type: boolean + default: false gh_comment: description: "Whether to post a comment on the PR with the Terraform plan" type: string @@ -95,7 +96,7 @@ jobs: GH_ARTIFACT_PATH: ${{ inputs.gh_artifact_path || vars.gh_artifact_path }} GH_ARTIFACT_NAME: ${{ inputs.gh_artifact_name || vars.gh_artifact_name }} GH_ARTIFACT_PATTERN: ${{ inputs.gh_artifact_pattern || vars.gh_artifact_pattern }} - GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple || false }} + GH_ARTIFACT_MERGE_MULTIPLE: ${{ inputs.gh_artifact_merge_multiple || vars.gh_artifact_merge_multiple }} uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 if: env.GH_ARTIFACT_PATH != '' || env.GH_ARTIFACT_NAME != '' with: