From c2df563a04ef374e7c598c89bf0eee1d7fc01f34 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 10:32:42 -0500 Subject: [PATCH 01/13] Add default tagging --- .github/workflows/terragrunt-deploy.yml | 21 ++++++++++++++---- terragrunt.hcl | 29 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml index acf90f4..8f5c5d3 100644 --- a/.github/workflows/terragrunt-deploy.yml +++ b/.github/workflows/terragrunt-deploy.yml @@ -45,6 +45,13 @@ jobs: test -z "${{ vars.DEPLOY_ROLE_ARN }}" && (echo "::error title=Repository Configuration Incomplete::This repository is missing an environment variable for DEPLOY_ROLE_ARN in the ${{ inputs.environment }} environment!"; raised=1) exit $raised + - name: "Set default Terraform Tags" + run: | + echo "${{ github.repository }}" | cut -d "/" -f 2 > repo.txt + echo "TF_VAR_organization_tag=${{ github.repository_owner }}" >> "$GITHUB_OUTPUT" + echo "TF_VAR_repository_tag=$(cat repo.txt)" >> "$GITHUB_OUTPUT" + echo "TF_VAR_commit_hash_tag=${{ github.sha }}" >> "$GITHUB_OUTPUT" + - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@a95656fcd9ec16a226c7099657b9fc91cc777601 with: @@ -59,6 +66,9 @@ jobs: AWS_REGION: ${{ inputs.region }} INPUT_PRE_EXEC_0: | sudo apt update -yqq && sudo apt install python3 -yqq + TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} + TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} + TF_VAR_organizaTF_VAR_commit_hash_tagtion_tag: ${{ vars.TF_VAR_commit_hash_tag }} with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} @@ -68,10 +78,13 @@ jobs: - name: Deploy uses: gruntwork-io/terragrunt-action@aee21a7df999be8b471c2a8564c6cd853cb674e1 env: - AWS_REGION: ${{ inputs.region }} - TERRAFORM_PLAN: ${{ steps.plan.outputs.TERRAFORM_PLAN }} - INPUT_PRE_EXEC_0: | - sudo apt update -yqq && sudo apt install python3 -yqq + AWS_REGION: ${{ inputs.region }} + TERRAFORM_PLAN: ${{ steps.plan.outputs.TERRAFORM_PLAN }} + INPUT_PRE_EXEC_0: | + sudo apt update -yqq && sudo apt install python3 -yqq + TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} + TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} + TF_VAR_organizaTF_VAR_commit_hash_tagtion_tag: ${{ vars.TF_VAR_commit_hash_tag }}z with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} diff --git a/terragrunt.hcl b/terragrunt.hcl index dd199f4..f8b2c49 100644 --- a/terragrunt.hcl +++ b/terragrunt.hcl @@ -24,12 +24,41 @@ generate "provider" { contents = < Date: Mon, 16 Jun 2025 10:36:48 -0500 Subject: [PATCH 02/13] Fix workflows --- .github/workflows/deploy-sandbox.yml | 24 ++++++++ .../{draft-release.yaml => draft-release.yml} | 0 ...ll-request.yaml => label-pull-request.yml} | 0 .../{python-tests.yaml => python-tests.yml} | 0 .github/workflows/test.yml | 60 ------------------- 5 files changed, 24 insertions(+), 60 deletions(-) create mode 100644 .github/workflows/deploy-sandbox.yml rename .github/workflows/{draft-release.yaml => draft-release.yml} (100%) rename .github/workflows/{label-pull-request.yaml => label-pull-request.yml} (100%) rename .github/workflows/{python-tests.yaml => python-tests.yml} (100%) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml new file mode 100644 index 0000000..5aee6de --- /dev/null +++ b/.github/workflows/deploy-sandbox.yml @@ -0,0 +1,24 @@ +name: Deploy Sandbox Environment + +on: + pull_request: + branches: [ main ] + push: + branches: [ main ] +permissions: + id-token: write + contents: read + +jobs: + call-terragrunt-deploy: + permissions: + contents: read + id-token: write + uses: ./.github/workflows/terragrunt-deploy.yml + with: + tf_version: '1.5.5' + tg_version: '0.54.11' + environment: sandbox + region: us-east-2 + env_id: '000' + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/draft-release.yaml b/.github/workflows/draft-release.yml similarity index 100% rename from .github/workflows/draft-release.yaml rename to .github/workflows/draft-release.yml diff --git a/.github/workflows/label-pull-request.yaml b/.github/workflows/label-pull-request.yml similarity index 100% rename from .github/workflows/label-pull-request.yaml rename to .github/workflows/label-pull-request.yml diff --git a/.github/workflows/python-tests.yaml b/.github/workflows/python-tests.yml similarity index 100% rename from .github/workflows/python-tests.yaml rename to .github/workflows/python-tests.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 8b2eccf..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Test AWS Connectivity - -on: - pull_request: - branches: [ main ] - push: - branches: [ main ] -permissions: - id-token: write - contents: read - -jobs: - deploy: - name: "Plan & Deploy Sandbox Environment" - runs-on: ubuntu-latest - environment: Sandbox - steps: - - name: Checkout - uses: actions/checkout@main - - - name: "Validate GitHub Environment" - run: | - raised=0 - test -z "${{ vars.DEPLOY_ROLE_ARN }}" && (echo "::error title=Repository Configuration Incomplete::This repository is missing an environment variable for DEPLOY_ROLE_ARN!"; raised=1) - test -z "${{ vars.AWS_REGION }}" && (echo "::error title=Repository Configuration Incomplete::This repository is missing a secret for AWS_REGION!"; raised=1) - exit $raised - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1.7.0 - with: - role-to-assume: ${{ vars.DEPLOY_ROLE_ARN }} - role-session-name: ${{ github.run_id }} - aws-region: ${{ vars.AWS_REGION }} - - - name: Plan - id: plan - uses: gruntwork-io/terragrunt-action@v2 - env: - AWS_REGION: ${{ vars.AWS_REGION }} - INPUT_PRE_EXEC_0: | - sudo apt update -yqq && sudo apt install python3 -yqq - with: - tf_version: '1.5.5' - tg_version: '0.54.11' - tg_dir: 'platform/sandbox/us-east-2/000' - tg_command: 'plan -out=sandbox.tfplan' - - - name: Deploy - uses: gruntwork-io/terragrunt-action@v2 - env: - AWS_REGION: ${{ vars.AWS_REGION }} - TERRAFORM_PLAN: ${{ steps.plan.outputs.TERRAFORM_PLAN }} - INPUT_PRE_EXEC_0: | - sudo apt update -yqq && sudo apt install python3 -yqq - with: - tf_version: '1.5.5' - tg_version: '0.54.11' - tg_dir: 'platform/sandbox/us-east-2/000' - tg_command: 'apply sandbox.tfplan' - From 3886e4b1788dcbd78cd16b95c989e174e7527219 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 10:38:05 -0500 Subject: [PATCH 03/13] Fix workflows --- .github/workflows/terragrunt-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml index 8f5c5d3..7f9e539 100644 --- a/.github/workflows/terragrunt-deploy.yml +++ b/.github/workflows/terragrunt-deploy.yml @@ -68,7 +68,7 @@ jobs: sudo apt update -yqq && sudo apt install python3 -yqq TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} - TF_VAR_organizaTF_VAR_commit_hash_tagtion_tag: ${{ vars.TF_VAR_commit_hash_tag }} + TF_VAR_commit_hash_tag: ${{ vars.TF_VAR_commit_hash_tag }} with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} @@ -84,7 +84,7 @@ jobs: sudo apt update -yqq && sudo apt install python3 -yqq TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} - TF_VAR_organizaTF_VAR_commit_hash_tagtion_tag: ${{ vars.TF_VAR_commit_hash_tag }}z + TF_VAR_commit_hash_tag: ${{ vars.TF_VAR_commit_hash_tag }} with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} From a7cbb204c397c68cdab79119ea9b5c728414f0cb Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 10:53:15 -0500 Subject: [PATCH 04/13] Fix outputs --- .github/workflows/terragrunt-deploy.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml index 7f9e539..801b735 100644 --- a/.github/workflows/terragrunt-deploy.yml +++ b/.github/workflows/terragrunt-deploy.yml @@ -46,6 +46,7 @@ jobs: exit $raised - name: "Set default Terraform Tags" + id: set-tags run: | echo "${{ github.repository }}" | cut -d "/" -f 2 > repo.txt echo "TF_VAR_organization_tag=${{ github.repository_owner }}" >> "$GITHUB_OUTPUT" @@ -66,9 +67,9 @@ jobs: AWS_REGION: ${{ inputs.region }} INPUT_PRE_EXEC_0: | sudo apt update -yqq && sudo apt install python3 -yqq - TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} - TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} - TF_VAR_commit_hash_tag: ${{ vars.TF_VAR_commit_hash_tag }} + TF_VAR_organization_tag: ${{ steps.set-tags.outputs.TF_VAR_organization_tag }} + TF_VAR_repository_tag: ${{ steps.set-tags.outputs.TF_VAR_repository_tag }} + TF_VAR_commit_hash_tag: ${{ steps.set-tags.outputs.TF_VAR_commit_hash_tag }} with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} @@ -82,9 +83,9 @@ jobs: TERRAFORM_PLAN: ${{ steps.plan.outputs.TERRAFORM_PLAN }} INPUT_PRE_EXEC_0: | sudo apt update -yqq && sudo apt install python3 -yqq - TF_VAR_organization_tag: ${{ vars.TF_VAR_organization_tag }} - TF_VAR_repository_tag: ${{ vars.TF_VAR_repository_tag }} - TF_VAR_commit_hash_tag: ${{ vars.TF_VAR_commit_hash_tag }} + TF_VAR_organization_tag: ${{ steps.set-tags.outputs.TF_VAR_organization_tag }} + TF_VAR_repository_tag: ${{ steps.set-tags.outputs.TF_VAR_repository_tag }} + TF_VAR_commit_hash_tag: ${{ steps.set-tags.outputs.TF_VAR_commit_hash_tag }} with: tf_version: ${{ inputs.tf_version }} tg_version: ${{ inputs.tg_version }} From 57044e5c650ca10b6bb8b30ea5da1beee3886525 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 10:56:19 -0500 Subject: [PATCH 05/13] Fix outputs --- .github/workflows/terragrunt-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml index 801b735..db34e93 100644 --- a/.github/workflows/terragrunt-deploy.yml +++ b/.github/workflows/terragrunt-deploy.yml @@ -48,6 +48,7 @@ jobs: - name: "Set default Terraform Tags" id: set-tags run: | + set -x echo "${{ github.repository }}" | cut -d "/" -f 2 > repo.txt echo "TF_VAR_organization_tag=${{ github.repository_owner }}" >> "$GITHUB_OUTPUT" echo "TF_VAR_repository_tag=$(cat repo.txt)" >> "$GITHUB_OUTPUT" From 469ae83b9e2ce3270a9d887b45b67f14991c43be Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 11:31:54 -0500 Subject: [PATCH 06/13] Add matrixed environment support --- .github/workflows/deploy-sandbox.yml | 57 +++++++++++++++++++++++-- .github/workflows/terragrunt-deploy.yml | 1 - 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index 5aee6de..dc63703 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -10,15 +10,66 @@ permissions: contents: read jobs: + build-matrix: + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.build-matrix.outputs.matrix }} + steps: + - name: Build Environment Matrix + id: build-matrix + shell: python + run: | + from pathlib import Path + import os + import json + + def discover_environments(platform_path: Path = Path("platform")) -> list[Path]: + return [d for d in platform_path.iterdir() if d.is_dir()] + + def discover_regions(environment_path: Path) -> list[Path]: + return [d for d in environment_path.iterdir() if d.is_dir()] + + def discover_instances(region_path: Path) -> list[Path]: + return [d for d in region_path.iterdir() if d.is_dir()] + + try: + ENVIRONMENT = os.environ['PLATFORM_ENVIRONMENT'] + except KeyError as ke: + raise ValueError("Environment variable named PLATFORM_ENVIRONMENT was not found. This variable must be supplied so that a matrix of environments can be built!") + + if len(ENVIRONMENT) == 0: + raise ValueError("Environment variable PLATFORM_ENVIRONMENT was empty. This variable must be supplied so that a matrix of environments can be built!") + + all_environments = discover_environments() + matrix = {"terragrunt_environment": []} + try: + selected_environment = list(filter(lambda x: x.name == ENVIRONMENT, all_environments))[0] + except Exception: + raise ValueError(f"Expected environment '{ENVIRONMENT}' not found in {all_environments}") + + regions = discover_regions(environment_path=selected_environment) + + for region_path in regions: + region_instances = discover_instances(region_path=region_path) + for instance in region_instances: + matrix["terragrunt_environment"].append({"environment": selected_environment.name, "region": region_path.name, "instance": instance.name}) + + with open(os.environ["GITHUB_OUTPUT"], "a") as f: + f.write(f"matrix={json.dumps(matrix, separators=(',', ':'))}") + call-terragrunt-deploy: + needs: build-matrix permissions: contents: read id-token: write + strategy: + fail-fast: false + matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }} uses: ./.github/workflows/terragrunt-deploy.yml with: tf_version: '1.5.5' tg_version: '0.54.11' - environment: sandbox - region: us-east-2 - env_id: '000' + environment: ${{ matrix.terragrunt_environment.environment }} + region: ${{ matrix.terragrunt_environment.region }} + env_id: ${{ matrix.terragrunt_environment.instance }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml index db34e93..9e87369 100644 --- a/.github/workflows/terragrunt-deploy.yml +++ b/.github/workflows/terragrunt-deploy.yml @@ -81,7 +81,6 @@ jobs: uses: gruntwork-io/terragrunt-action@aee21a7df999be8b471c2a8564c6cd853cb674e1 env: AWS_REGION: ${{ inputs.region }} - TERRAFORM_PLAN: ${{ steps.plan.outputs.TERRAFORM_PLAN }} INPUT_PRE_EXEC_0: | sudo apt update -yqq && sudo apt install python3 -yqq TF_VAR_organization_tag: ${{ steps.set-tags.outputs.TF_VAR_organization_tag }} From 873dfce8f8e7f43d6e452fdc6452fccc6e2fa52c Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 11:34:29 -0500 Subject: [PATCH 07/13] Pass env var --- .github/workflows/deploy-sandbox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index afe512b..e80da09 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -18,6 +18,8 @@ jobs: - name: Build Environment Matrix id: build-matrix shell: python + env: + PLATFORM_ENVIRONMENT: "sandbox" run: | from pathlib import Path import os From 0ddba9365bb06a507f4b34615f686c08b1bd1429 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 11:35:24 -0500 Subject: [PATCH 08/13] Checkout first --- .github/workflows/deploy-sandbox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index e80da09..a006a8b 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -15,6 +15,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: + - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f - name: Build Environment Matrix id: build-matrix shell: python From cdee5b2f9e1df7d98ce06d97f702c013592651a2 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 11:37:14 -0500 Subject: [PATCH 09/13] Always deploy sandbox on PR --- .github/workflows/deploy-sandbox.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index a006a8b..9bc6099 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -1,10 +1,11 @@ name: Deploy Sandbox Environment on: - pull_request: - branches: [ main ] push: - branches: [ main ] + branches-ignore: [ "main" ] + pull_request: + branches: [ "**" ] + permissions: id-token: write contents: read From 393c587777e72b15425c8a5ae494f51f40d8b765 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 11:42:42 -0500 Subject: [PATCH 10/13] Echo matrix contents to assist in debugging --- .github/workflows/deploy-sandbox.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index 9bc6099..fb97421 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -58,6 +58,9 @@ jobs: for instance in region_instances: matrix["terragrunt_environment"].append({"environment": selected_environment.name, "region": region_path.name, "instance": instance.name}) + print("Generated the following environment matrix:") + print(json.dumps(matrix, indent=4)) + with open(os.environ["GITHUB_OUTPUT"], "a") as f: f.write(f"matrix={json.dumps(matrix, separators=(',', ':'))}") From e8458219f77d6e3c1e80993e20a5681cc5054167 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 12:02:06 -0500 Subject: [PATCH 11/13] Try to resolve duplicate runs --- .github/workflows/deploy-sandbox.yml | 12 +++++++++++- .github/workflows/python-tests.yml | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index fb97421..def39fb 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -11,6 +11,15 @@ permissions: contents: read jobs: + check-duplicate-runs: + runs-on: ubuntu-latest + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@04a1aebece824b56e6ad6a401d015479cd1c50b3 + with: + skip_after_successful_duplicate: 'true' build-matrix: runs-on: ubuntu-latest outputs: @@ -65,7 +74,8 @@ jobs: f.write(f"matrix={json.dumps(matrix, separators=(',', ':'))}") call-terragrunt-deploy: - needs: build-matrix + needs: [check-duplicate-runs, build-matrix] + if: ${{ needs.check-duplicate-runs.outputs.should_skip != 'true' }} permissions: contents: read id-token: write diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 82f22c5..65deba1 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -15,8 +15,19 @@ permissions: pull-requests: write jobs: + check-duplicate-runs: + runs-on: ubuntu-latest + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@04a1aebece824b56e6ad6a401d015479cd1c50b3 + with: + skip_after_successful_duplicate: 'true' run-tests: runs-on: ubuntu-latest + needs: check-duplicate-runs + if: ${{ needs.check-duplicate-runs.outputs.should_skip != 'true' }} strategy: matrix: # Adjust the matrix to test against different or multiple versions. From d3296ceb987ae359ca3fbc404f77ab92bbca3364 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 12:07:26 -0500 Subject: [PATCH 12/13] Try to resolve duplicate runs --- .github/workflows/deploy-sandbox.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index def39fb..24271fb 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -1,8 +1,6 @@ name: Deploy Sandbox Environment on: - push: - branches-ignore: [ "main" ] pull_request: branches: [ "**" ] From a27521e6f3c6ef194b09977f3bf342623e276636 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jun 2025 12:09:13 -0500 Subject: [PATCH 13/13] Rip out dupe detection, alter deploy trigger --- .github/workflows/deploy-sandbox.yml | 12 +----------- .github/workflows/python-tests.yml | 11 ----------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yml b/.github/workflows/deploy-sandbox.yml index 24271fb..c14f5a4 100644 --- a/.github/workflows/deploy-sandbox.yml +++ b/.github/workflows/deploy-sandbox.yml @@ -9,15 +9,6 @@ permissions: contents: read jobs: - check-duplicate-runs: - runs-on: ubuntu-latest - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@04a1aebece824b56e6ad6a401d015479cd1c50b3 - with: - skip_after_successful_duplicate: 'true' build-matrix: runs-on: ubuntu-latest outputs: @@ -72,8 +63,7 @@ jobs: f.write(f"matrix={json.dumps(matrix, separators=(',', ':'))}") call-terragrunt-deploy: - needs: [check-duplicate-runs, build-matrix] - if: ${{ needs.check-duplicate-runs.outputs.should_skip != 'true' }} + needs: build-matrix permissions: contents: read id-token: write diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 65deba1..82f22c5 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -15,19 +15,8 @@ permissions: pull-requests: write jobs: - check-duplicate-runs: - runs-on: ubuntu-latest - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@04a1aebece824b56e6ad6a401d015479cd1c50b3 - with: - skip_after_successful_duplicate: 'true' run-tests: runs-on: ubuntu-latest - needs: check-duplicate-runs - if: ${{ needs.check-duplicate-runs.outputs.should_skip != 'true' }} strategy: matrix: # Adjust the matrix to test against different or multiple versions.