diff --git a/.github/workflows/main-branch.yml b/.github/workflows/branch.yml similarity index 54% rename from .github/workflows/main-branch.yml rename to .github/workflows/branch.yml index 9620df0..b6eb52f 100644 --- a/.github/workflows/main-branch.yml +++ b/.github/workflows/branch.yml @@ -1,5 +1,10 @@ -name: Main branch +name: Branch on: + pull_request: + branches: + - main + - release/** + types: [opened, synchronize, reopened] push: branches: - main @@ -16,6 +21,6 @@ permissions: actions: write jobs: - perform: - uses: cloudposse/github-actions-workflows-github-action-composite/.github/workflows/main-branch.yml@main + github-action: + uses: cloudposse/.github/.github/workflows/shared-github-action.yml@main secrets: inherit diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml deleted file mode 100644 index 7e956bc..0000000 --- a/.github/workflows/feature-branch.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Feature branch -on: - pull_request: - branches: - - main - - release/v* - types: [opened, synchronize, reopened] - -permissions: - contents: write - actions: write - -jobs: - perform: - uses: cloudposse/github-actions-workflows-github-action-composite/.github/workflows/feature-branch.yml@main - secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa99858..370dce8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,6 @@ permissions: contents: write jobs: - perform: - uses: cloudposse/github-actions-workflows-github-action-composite/.github/workflows/release.yml@main + github-action: + uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main secrets: inherit