From e1af2d76f094dc79c89439c5e9defe8943c31ec3 Mon Sep 17 00:00:00 2001 From: Erik Osterman Date: Mon, 20 May 2024 18:50:15 -0500 Subject: [PATCH] chore: Update GitHub Workflows to use shared workflows from '.github' repo --- .github/workflows/branch.yml | 25 +++++++++++++++++++ ...feature-branch-chatops.yml => chatops.yml} | 4 +-- .github/workflows/feature-branch.yml | 19 -------------- .github/workflows/release-branch.yml | 22 ---------------- .github/workflows/release-published.yml | 14 ----------- .github/workflows/release.yml | 13 ++++++++++ .github/workflows/scheduled.yml | 5 ++-- 7 files changed, 42 insertions(+), 60 deletions(-) create mode 100644 .github/workflows/branch.yml rename .github/workflows/{feature-branch-chatops.yml => chatops.yml} (60%) delete mode 100644 .github/workflows/feature-branch.yml delete mode 100644 .github/workflows/release-branch.yml delete mode 100644 .github/workflows/release-published.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml new file mode 100644 index 0000000..fd64cd8 --- /dev/null +++ b/.github/workflows/branch.yml @@ -0,0 +1,25 @@ +--- +name: Branch +on: + pull_request: + branches: + - main + - release/** + types: [opened, synchronize, reopened, labeled, unlabeled] + push: + branches: + - main + - release/v* + paths-ignore: + - '.github/**' + - 'docs/**' + - 'examples/**' + - 'test/**' + - 'README.md' + +permissions: {} + +jobs: + terraform-module: + uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main + secrets: inherit diff --git a/.github/workflows/feature-branch-chatops.yml b/.github/workflows/chatops.yml similarity index 60% rename from .github/workflows/feature-branch-chatops.yml rename to .github/workflows/chatops.yml index 9abfc61..c3d47fa 100644 --- a/.github/workflows/feature-branch-chatops.yml +++ b/.github/workflows/chatops.yml @@ -1,5 +1,5 @@ --- -name: feature-branch-chatops +name: chatops on: issue_comment: types: [created] @@ -11,6 +11,6 @@ permissions: jobs: terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-chatops.yml@main + uses: cloudposse/.github/.github/workflows/shared-terraform-chatops.yml@main secrets: github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }} diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml deleted file mode 100644 index 8faa955..0000000 --- a/.github/workflows/feature-branch.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: feature-branch -on: - pull_request: - branches: - - main - - release/** - types: [opened, synchronize, reopened, labeled, unlabeled] - -permissions: - pull-requests: write - id-token: write - contents: write - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch.yml@main - secrets: - github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }} diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml deleted file mode 100644 index 3f8fe62..0000000 --- a/.github/workflows/release-branch.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: release-branch -on: - push: - branches: - - main - - release/** - paths-ignore: - - '.github/**' - - 'docs/**' - - 'examples/**' - - 'test/**' - -permissions: - contents: write - id-token: write - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main - secrets: - github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }} diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml deleted file mode 100644 index f86352b..0000000 --- a/.github/workflows/release-published.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: release-published -on: - release: - types: - - published - -permissions: - contents: write - id-token: write - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release.yml@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..f968068 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,13 @@ +--- +name: release +on: + release: + types: + - published + +permissions: {} + +jobs: + terraform-module: + uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main + secrets: inherit diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 163be0b..a79e949 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,6 +12,5 @@ permissions: jobs: scheduled: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main - secrets: - github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }} + uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main + secrets: inherit