Skip to content

Commit

Permalink
Merge pull request #211 from UN-OCHA/update/patch-7214e15
Browse files Browse the repository at this point in the history
Automatic Composer Update
  • Loading branch information
berliner authored May 14, 2024
2 parents 7214e15 + a4017ca commit e184ac3
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .github/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- default

mysql:
image: public.ecr.aws/unocha/mysql:10.6
image: public.ecr.aws/unocha/mysql:10.11
hostname: hpc-content-test-mysql
container_name: hpc-content-test-mysql
environment:
Expand Down Expand Up @@ -92,4 +92,4 @@ services:
ports:
- "7900:7900"
networks:
- default
- default
5 changes: 3 additions & 2 deletions .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ jobs:
id: update-action
uses: UN-OCHA/actions/composer-update@main
with:
aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
github_access_token: ${{ secrets.PAT }}
patch_branch: 'develop'
patch_packages: 'drupal/*'
patch_branch: ${{ github.head_ref || github.ref_name }}
patch_maintainers: ${{ vars.DRUPAL_MAINTAINERS }}
slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
slack_channel_name: ${{ vars.SLACK_CHANNEL }}
21 changes: 14 additions & 7 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ on: [pull_request]
jobs:
tests:
runs-on: ubuntu-latest
permissions:
contents: write
checks: write
pull-requests: write
actions: read
statuses: write

steps:
- name: Checkout Code
id: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Extract PHP Version
id: php
Expand Down Expand Up @@ -97,6 +103,7 @@ jobs:
with:
run: |
docker-compose -f .github/tests/docker-compose.yml exec -w /srv/www -T drupal /usr/bin/composer run sub-theme
- name: PHPCS
id: phpcs
uses: cafuego/command-output@main
Expand Down Expand Up @@ -157,18 +164,18 @@ jobs:
docker-compose -f .github/tests/docker-compose.yml exec -T drupal drush watchdog:show
- name: Find Comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
id: fc
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
body-includes: Build output

- name: Create or update comment
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body: |
Expand All @@ -193,7 +200,7 @@ jobs:
- name: Slack Success Notification
id: slack_success
if: success()
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '${{ vars.SLACK_CHANNEL }}'
payload: |
Expand All @@ -220,7 +227,7 @@ jobs:
- name: Slack Failure Notification
id: slack_failure
if: failure()
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '${{ vars.SLACK_CHANNEL }}'
payload: |
Expand Down
93 changes: 47 additions & 46 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e184ac3

Please sign in to comment.