Skip to content

Commit

Permalink
Merge pull request #745 from UN-OCHA/develop
Browse files Browse the repository at this point in the history
Main -> Develop - v2.4.1
  • Loading branch information
orakili committed Mar 13, 2024
2 parents acf5d78 + 956cce4 commit 3d21480
Show file tree
Hide file tree
Showing 16 changed files with 2,321 additions and 13,840 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Checkout Code
id: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Extract PHP Version
id: php
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Configure AWS Credentials
id: aws
uses: aws-actions/configure-aws-credentials@v3
uses: aws-actions/configure-aws-credentials@v4
if: ${{ !env.ACT }}
with:
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
Expand All @@ -80,7 +80,7 @@ jobs:

- name: Login to Public ECR
id: aws-login
uses: docker/login-action@v2.1.0
uses: docker/login-action@v3
if: ${{ !env.ACT }}
with:
registry: public.ecr.aws
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
comment_footer: false

- name: Find Comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
if: ${{ !env.ACT }}
id: fc
with:
Expand All @@ -164,7 +164,7 @@ jobs:
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
if: ${{ !env.ACT }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
- name: Slack Success Notification
id: slack_success
if: ${{ !env.ACT && 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 All @@ -219,7 +219,7 @@ jobs:
- name: Slack Failure Notification
id: slack_failure
if: ${{ !env.ACT && 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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"lolli42/finediff": "^1.0",
"orakili/composer-drupal-info-file-patch-helper": "^1",
"pelago/emogrifier": "^7.0",
"reliefweb/api-indexer": "^v2.5.0",
"reliefweb/api-indexer": "^v2.8",
"reliefweb/simple-autocomplete": "^v1.3",
"reliefweb/simple-datepicker": "^v1.3",
"symfony/uid": "^6.2",
Expand Down
Loading

0 comments on commit 3d21480

Please sign in to comment.