diff --git a/.github/workflows/release-branch.yml b/.github/workflows/branch.yml similarity index 52% rename from .github/workflows/release-branch.yml rename to .github/workflows/branch.yml index 852d5e3..fd64cd8 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/branch.yml @@ -1,6 +1,11 @@ --- -name: release-branch +name: Branch on: + pull_request: + branches: + - main + - release/** + types: [opened, synchronize, reopened, labeled, unlabeled] push: branches: - main @@ -16,5 +21,5 @@ permissions: {} jobs: terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main + uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main secrets: inherit diff --git a/.github/workflows/chatops.yml b/.github/workflows/chatops.yml index 23f96d8..c3d47fa 100644 --- a/.github/workflows/chatops.yml +++ b/.github/workflows/chatops.yml @@ -1,37 +1,16 @@ +--- name: chatops on: issue_comment: types: [created] -jobs: - default: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: "Handle common commands" - uses: cloudposse/actions/github/slash-command-dispatch@0.30.0 - with: - token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }} - reaction-token: ${{ secrets.GITHUB_TOKEN }} - repository: cloudposse/actions - commands: rebuild-readme, terraform-fmt - permission: triage - issue-type: pull-request - - test: - runs-on: ubuntu-latest - steps: - - name: "Checkout commit" - uses: actions/checkout@v2 - - name: "Run tests" - uses: cloudposse/actions/github/slash-command-dispatch@0.30.0 - with: - token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }} - reaction-token: ${{ secrets.GITHUB_TOKEN }} - repository: cloudposse/actions - commands: test - permission: triage - issue-type: pull-request - reactions: false - +permissions: + pull-requests: write + id-token: write + contents: write +jobs: + terraform-module: + 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-chatops.yml b/.github/workflows/feature-branch-chatops.yml deleted file mode 100644 index 9abfc61..0000000 --- a/.github/workflows/feature-branch-chatops.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: feature-branch-chatops -on: - issue_comment: - types: [created] - -permissions: - pull-requests: write - id-token: write - contents: write - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-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 ebd8854..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 - issues: write - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch.yml@main - secrets: inherit diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml deleted file mode 100644 index 1b0aaca..0000000 --- a/.github/workflows/release-published.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: release-published -on: - release: - types: - - published - -permissions: {} - -jobs: - terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main - secrets: inherit 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 7bc09ab..a79e949 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,5 +12,5 @@ permissions: jobs: scheduled: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main + uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main secrets: inherit