diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f00ec916..108dc682 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,9 @@ on: push: branches: - master - - develop - feature/[a-z]+-[0-9]+/dev-* + - bugfix/[a-z]+-[0-9]+/dev-* + - rc workflow_dispatch: env: @@ -91,3 +92,33 @@ jobs: - name: Code Coverage Report if: success() && matrix.php-version == '8.1' uses: codecov/codecov-action@v1 + + automerge: + runs-on: ubuntu-latest + if: ${{ success() && github.event_name == 'pull_request' && github.base_ref == 'rc' }} + needs: [ validation ] + steps: + # https://github.com/marketplace/actions/list-files-in-pull-request + - uses: ankitjain28may/list-files-in-pr@v1.0 + id: list-files + with: + githubToken: ${{ secrets.PAT }} + outputFormat: 'space-delimited' + + # https://github.com/marketplace/actions/merge-pull-requests-automerge-action + - id: automerge + if: ${{ steps.list-files.outputs.pullRequestFiles == 'composer.lock' }} + name: automerge + uses: "pascalgn/automerge-action@v0.15.6" + env: + GITHUB_TOKEN: ${{ secrets.PAT }} + MERGE_LABELS: "composer dependencies" + MERGE_METHOD: "squash" + MERGE_COMMIT_MESSAGE: "pull-request-title" + MERGE_FORKS: "false" + MERGE_RETRIES: "3" + MERGE_RETRY_SLEEP: "10000" + MERGE_REQUIRED_APPROVALS: "0" + UPDATE_LABELS: "" + UPDATE_METHOD: "merge" + PULL_REQUEST: ${{ github.event.pull_request.number }} diff --git a/.github/workflows/upgrader-dependency-update-pr.yml b/.github/workflows/upgrader-dependency-update-pr.yml deleted file mode 100644 index c8f23ab0..00000000 --- a/.github/workflows/upgrader-dependency-update-pr.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Update Upgrader dependencies - -env: - TARGET_BRANCH: rc - DEPENDENCIES: spryker-sdk/upgrader spryker-sdk/integrator - PR_BRANCH: update-dependencies - PR_LABELS: composer dependencies - PR_ASSIGNEES: pavelmaksimov25,DmytroKlymanSpryker - PR_REVIEWERS: pavelmaksimov25,DmytroKlymanSpryker - -on: - repository_dispatch: - types: [ upgrader_dependency_updated ] - -jobs: - update-dependencies: - runs-on: ubuntu-latest - steps: - - id: commit - uses: pr-mpt/actions-commit-hash@v2 - - - name: Checkout project - uses: actions/checkout@v3 - with: - ref: ${{ env.TARGET_BRANCH }} - - - name: Update dependencies - run: composer update ${{ env.DEPENDENCIES }} --no-scripts --no-progress --no-install - - - name: Commit, push and create pull request - uses: peter-evans/create-pull-request@v5 - with: - title: Updated internal SDK dependencies - body: | - This pull request updates internal SDK dependencies ${{ env.DEPENDENCIES }} to the latest version. - commit-message: Updated SDK dependencies - ${{ env.DEPENDENCIES }} - committer: SprykerReleaseBot - author: ${{ github.actor }} <${{ github.actor }}@example.test> - base: ${{ env.TARGET_BRANCH }} - branch: ${{ env.PR_BRANCH }} - branch-suffix: timestamp - labels: ${{ env.PR_LABELS }} - delete-branch: true - assignees: ${{ env.PR_ASSIGNEES }} - reviewers: ${{ env.PR_REVIEWERS }} diff --git a/composer.lock b/composer.lock index a22fb2a4..227c9bb3 100644 --- a/composer.lock +++ b/composer.lock @@ -7084,12 +7084,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/integrator.git", - "reference": "431e07ef737b1e4545820a1b5c0ec0c3f22e2b3f" + "reference": "8da0b5768275b461b8ce72ea83f66f14347d7950" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/431e07ef737b1e4545820a1b5c0ec0c3f22e2b3f", - "reference": "431e07ef737b1e4545820a1b5c0ec0c3f22e2b3f", + "url": "https://api.github.com/repos/spryker-sdk/integrator/zipball/8da0b5768275b461b8ce72ea83f66f14347d7950", + "reference": "8da0b5768275b461b8ce72ea83f66f14347d7950", "shasum": "" }, "require": { @@ -7114,7 +7114,7 @@ "phpstan/phpstan": "^1.0.0", "phpunit/phpunit": "^9.5.0", "spryker-sdk/manifest-test-data-provider": "dev-master", - "spryker/code-sniffer": "dev-master", + "spryker/code-sniffer": "0.17.18", "symfony/filesystem": "^5.3.0 || ^6.0" }, "default-branch": true, @@ -7141,7 +7141,7 @@ "issues": "https://github.com/spryker-sdk/integrator/issues", "source": "https://github.com/spryker-sdk/integrator/tree/master" }, - "time": "2023-10-27T08:41:42+00:00" + "time": "2023-11-07T08:51:28+00:00" }, { "name": "spryker-sdk/sdk-contracts", @@ -7336,12 +7336,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/upgrader.git", - "reference": "55c7786fed53e9441b760717afdac8c39a92129b" + "reference": "e2b4391713dba6dd69f2ddba9762f04dadce8207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/55c7786fed53e9441b760717afdac8c39a92129b", - "reference": "55c7786fed53e9441b760717afdac8c39a92129b", + "url": "https://api.github.com/repos/spryker-sdk/upgrader/zipball/e2b4391713dba6dd69f2ddba9762f04dadce8207", + "reference": "e2b4391713dba6dd69f2ddba9762f04dadce8207", "shasum": "" }, "require": { @@ -7403,7 +7403,7 @@ "issues": "https://github.com/spryker-sdk/upgrader/issues", "source": "https://github.com/spryker-sdk/upgrader/tree/master" }, - "time": "2023-10-27T08:47:24+00:00" + "time": "2023-11-07T08:54:07+00:00" }, { "name": "spryker/architecture-sniffer",