From bf727a43507e3eb66fd23d664cf52e4d6e62d3c3 Mon Sep 17 00:00:00 2001 From: slr655 <281893864+slr655@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:43:55 +0000 Subject: [PATCH 1/3] workflow to update php packages --- .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/update-packages.yml | 46 +++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/update-packages.yml diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 64ce5d1..9bea47e 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -30,7 +30,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Auto-merge patch updates only - if: steps.meta.outputs.update-type == 'version-update:semver-patch' + if: steps.meta.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} diff --git a/.github/workflows/update-packages.yml b/.github/workflows/update-packages.yml new file mode 100644 index 0000000..d3e9d27 --- /dev/null +++ b/.github/workflows/update-packages.yml @@ -0,0 +1,46 @@ +name: Update PHP packages + +on: + push: + # Temporary: remove before merging to main + schedule: + - cron: "0 9 * * 1,3" #Monday and Wednesday at 9:00 AM UTC + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + update-packages: + name: Update Composer lockfile + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + + - name: Install PHP + uses: shivammathur/setup-php@v2 + with: + php-version: "8.5" + tools: composer + + - name: Update PHP packages + working-directory: user-restricted-separate-auth-tutorials/nhs-login/php + run: composer update --no-interaction #NOSONAR + + - name: Create pull request + uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 #v8.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + sign-commits: true + branch: APM-6800-update-php + base: main + delete-branch: true + add-paths: | + user-restricted-separate-auth-tutorials/nhs-login/php/composer.lock + commit-message: "chore: update PHP packages" + title: "chore: update PHP packages" + body: "Updates PHP dependencies in user-restricted-separate-auth-tutorials/nhs-login/php/composer.lock." + labels: dependencies, php, composer From e31789bb7860185934332b768c6274481b95ace1 Mon Sep 17 00:00:00 2001 From: slr655 <281893864+slr655@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:47:16 +0000 Subject: [PATCH 2/3] trigger on push --- .github/workflows/update-packages.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-packages.yml b/.github/workflows/update-packages.yml index d3e9d27..bb081c8 100644 --- a/.github/workflows/update-packages.yml +++ b/.github/workflows/update-packages.yml @@ -2,9 +2,8 @@ name: Update PHP packages on: push: - # Temporary: remove before merging to main - schedule: - - cron: "0 9 * * 1,3" #Monday and Wednesday at 9:00 AM UTC + branches: + - APM-6800-enable-automated-patches workflow_dispatch: permissions: From 70e132f5d0451a682394457d344cf2836c70689f Mon Sep 17 00:00:00 2001 From: slr655 <281893864+slr655@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:59:59 +0000 Subject: [PATCH 3/3] change to update yarn packages --- .github/workflows/update-packages.yml | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/update-packages.yml b/.github/workflows/update-packages.yml index bb081c8..08b69b4 100644 --- a/.github/workflows/update-packages.yml +++ b/.github/workflows/update-packages.yml @@ -1,9 +1,8 @@ -name: Update PHP packages +name: Update Yarn packages on: push: - branches: - - APM-6800-enable-automated-patches + branches: [ APM-6800-enable-automated-patches ] workflow_dispatch: permissions: @@ -12,34 +11,36 @@ permissions: jobs: update-packages: - name: Update Composer lockfile + name: Update Yarn lockfile runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Install PHP - uses: shivammathur/setup-php@v2 + - name: Install Node.js + uses: actions/setup-node@v7 with: - php-version: "8.5" - tools: composer + node-version: "22" - - name: Update PHP packages + - name: Update Yarn packages working-directory: user-restricted-separate-auth-tutorials/nhs-login/php - run: composer update --no-interaction #NOSONAR + run: | + corepack enable + yarn install + yarn upgrade #NOSONAR - name: Create pull request uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 #v8.1.1 with: token: ${{ secrets.GITHUB_TOKEN }} sign-commits: true - branch: APM-6800-update-php + branch: APM-6800-update-yarn base: main delete-branch: true add-paths: | - user-restricted-separate-auth-tutorials/nhs-login/php/composer.lock - commit-message: "chore: update PHP packages" - title: "chore: update PHP packages" - body: "Updates PHP dependencies in user-restricted-separate-auth-tutorials/nhs-login/php/composer.lock." - labels: dependencies, php, composer + user-restricted-separate-auth-tutorials/nhs-login/php/yarn.lock + commit-message: "chore: update Yarn packages" + title: "chore: update Yarn packages" + body: "Updates JavaScript dependencies in user-restricted-separate-auth-tutorials/nhs-login/php/yarn.lock." + labels: dependencies, javascript, yarn