Skip to content

Commit

Permalink
Merge pull request #243 from UN-OCHA/develop
Browse files Browse the repository at this point in the history
Deploy 20/03/24
  • Loading branch information
lazysoundsystem authored Mar 18, 2024
2 parents 267348b + fd394bd commit aedd182
Show file tree
Hide file tree
Showing 28 changed files with 2,972 additions and 10,668 deletions.
15 changes: 8 additions & 7 deletions .docksal/settings/settings.local.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,16 @@
*/
$settings['skip_permissions_hardening'] = TRUE;



// Docksal DB connection settings.
$databases['default']['default'] = array (
'database' => 'slt8',
'username' => 'slt8',
'password' => 'slt8',
'host' => 'mysql',
'driver' => 'mysql',
'database' => 'default',
'username' => 'root',
'password' => 'root',
'prefix' => '',
'host' => 'db',
'port' => '3306',
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
'driver' => 'mysql',
);

// Workaround for permission issues with NFS shares
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-image.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@v1
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Build The Thing
Expand Down
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 @@ -72,7 +72,7 @@ jobs:
- name: Configure AWS Credentials
id: aws
if: ${{ !env.ACT }}
uses: aws-actions/configure-aws-credentials@v3
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Login to Public ECR
id: aws-login
if: ${{ !env.ACT }}
uses: docker/login-action@v2.1.0
uses: docker/login-action@v3
with:
registry: public.ecr.aws
username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
docker compose -f 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
if: ${{ !env.ACT }}
id: fc
with:
Expand All @@ -190,7 +190,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 @@ -218,7 +218,7 @@ jobs:
- name: Slack Success Notification
id: slack_success
if: ${{ !env.ACT && success() }}
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '${{ secrets.SLACK_CHANNEL }}'
payload: |
Expand All @@ -245,7 +245,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: '${{ secrets.SLACK_CHANNEL }}'
payload: |
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"drush/drush": "^12",
"orakili/composer-drupal-info-file-patch-helper": "^1",
"phpoffice/phpspreadsheet": "^1.27.1",
"unocha/common_design": "^8.0",
"unocha/common_design": "^9",
"unocha/ocha_monitoring": "^1.0",
"webflo/drupal-finder": "^1.2.2"
},
"require-dev": {
Expand Down
Loading

0 comments on commit aedd182

Please sign in to comment.