diff --git a/.github/actions/create-auto-merged-pull-request/action.yml b/.github/actions/create-auto-merged-pull-request/action.yml deleted file mode 100644 index b1ebf08..0000000 --- a/.github/actions/create-auto-merged-pull-request/action.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Create Auto-merged Pull Request - -description: Create Auto-merged Pull Request - -inputs: - add-paths: - description: > - A comma or newline-separated list of file paths to commit. - Paths should follow git's pathspec syntax. - Defaults to adding all new and modified files. - branch: - description: The pull request branch name. - title: - description: The title of the pull request. - labels: - description: A comma or newline separated list of labels. - - # secrets - app-id: - description: GitHub App ID that will use to create, update and close the pull request. - required: true - private-key: - description: GitHub App private key that will use to create, update and close the pull request. - required: true - -runs: - using: composite - steps: - - name: Create GitHub App Token - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 - id: app-token - with: - app-id: ${{ inputs.app-id }} - private-key: ${{ inputs.private-key }} - permission-contents: write - permission-pull-requests: write - - - name: Create Pull Request - id: create-pull-request - uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0 - with: - token: ${{ steps.app-token.outputs.token }} - commit-message: | # The blank line is important. - ${{ inputs.title }} - - Automated commit by the `${{ github.workflow }}` workflow. - branch: ${{ inputs.branch }} - delete-branch: true - sign-commits: true - title: ${{ inputs.title }} - body: "Automated commit by the `${{ github.workflow }}` workflow." - labels: | - tastendruck - ${{ inputs.labels }} - - - name: Enable auto-merge for the PR - if: steps.create-pull-request.outputs.pull-request-operation == 'created' || steps.create-pull-request.outputs.pull-request-operation == 'updated' - run: gh pr merge --auto --squash "$PR_URL" - shell: bash - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - PR_URL: ${{ steps.create-pull-request.outputs.pull-request-url }} diff --git a/.github/workflows/format-php.yml b/.github/workflows/format-php.yml index 7c0a484..8d6fea0 100644 --- a/.github/workflows/format-php.yml +++ b/.github/workflows/format-php.yml @@ -61,12 +61,13 @@ jobs: if: ${{ inputs.pint-extra-paths != '' }} shell: bash - # TODO: Pinact always 1 tag behind - - uses: typisttech/.github/.github/actions/create-auto-merged-pull-request@45c776c6114c7493626281d38635f0578b3b2c7d # v3.5.0 + - uses: typisttech/create-auto-merged-pull-request-action@42c8119c5e4397506847dc4d27168e98ce69dfc7 # v0.1.0 with: branch: tastendruck/pint/${{ github.ref_name }} title: ":robot: `pint`" - labels: pint + labels: | + pint + tastendruck app-id: ${{ vars.TASTENDRUCK_APP_ID }} private-key: ${{ secrets.TASTENDRUCK_PRIVATE_KEY }} @@ -87,11 +88,12 @@ jobs: - run: composer-normalize shell: bash - # TODO: Pinact always 1 tag behind - - uses: typisttech/.github/.github/actions/create-auto-merged-pull-request@45c776c6114c7493626281d38635f0578b3b2c7d # v3.5.0 + - uses: typisttech/create-auto-merged-pull-request-action@42c8119c5e4397506847dc4d27168e98ce69dfc7 # v0.1.0 with: branch: tastendruck/composer-normalize/${{ github.ref_name }} title: ":robot: `composer normalize`" - labels: composer-normalize + labels: | + composer-normalize + tastendruck app-id: ${{ vars.TASTENDRUCK_APP_ID }} private-key: ${{ secrets.TASTENDRUCK_PRIVATE_KEY }}