Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy 17-09-2024 #482

Merged
merged 36 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
859c031
Merge pull request #468 from UN-OCHA/main
lazysoundsystem Aug 14, 2024
52f98d8
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins Aug 15, 2024
6a59708
chore: add patch to fix tests
lazysoundsystem Aug 19, 2024
978569a
chore: remove version from docker-compose file
lazysoundsystem Aug 19, 2024
d84189c
chore: include config update, remove patch
lazysoundsystem Aug 19, 2024
7ca296f
Merge pull request #469 from UN-OCHA/update/patch-859c031
lazysoundsystem Aug 19, 2024
f329230
chore(deps-dev): Bump axios in /html/themes/custom/gms_ocha_common
dependabot[bot] Aug 19, 2024
6b59405
Merge pull request #470 from UN-OCHA/dependabot/npm_and_yarn/html/the…
lazysoundsystem Aug 19, 2024
78fb240
Header and Footer Changes
maheshtrigyn Aug 27, 2024
ca76c1b
Merge pull request #471 from UN-OCHA/gms-site-header-footer-changes
maheshtrigyn Aug 27, 2024
6927764
chore: include php logs if tests fail
lazysoundsystem Aug 28, 2024
2c10f36
Merge pull request #472 from UN-OCHA/OPS-10706-php-logs-in-tests
lazysoundsystem Aug 28, 2024
df01339
chore: remove outdated patch
lazysoundsystem Aug 29, 2024
b40f952
Merge pull request #473 from UN-OCHA/update/remove-patch
lazysoundsystem Aug 29, 2024
377a638
chore: update codemirror_editor module to include dependency
lazysoundsystem Aug 29, 2024
5e6e8e3
Merge branch 'develop' into update/remove-patch
lazysoundsystem Aug 29, 2024
7e6f9fc
chore: enable dependency too
lazysoundsystem Aug 29, 2024
32f9310
Merge branch 'update/remove-patch' of github.com:UN-OCHA/gms-site int…
lazysoundsystem Aug 29, 2024
db94fe8
fix: include core patch for aggregation error
lazysoundsystem Aug 29, 2024
d9a48a9
Merge pull request #475 from UN-OCHA/OPS-10532-aggregation-fix
lazysoundsystem Aug 29, 2024
68986be
Merge branch 'develop' into update/remove-patch
lazysoundsystem Sep 5, 2024
3ca1922
Merge pull request #474 from UN-OCHA/update/remove-patch
lazysoundsystem Sep 5, 2024
4de13a9
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins Sep 5, 2024
106ba63
Merge pull request #477 from UN-OCHA/update/patch-3ca1922
lazysoundsystem Sep 5, 2024
f22bd89
chore: pass on credentials to action
lazysoundsystem Sep 12, 2024
cd43c6e
Merge branch 'develop' into OPS-10254-credentials
lazysoundsystem Sep 12, 2024
e8f02b0
Merge pull request #478 from UN-OCHA/OPS-10254-credentials
lazysoundsystem Sep 12, 2024
efcc79d
chore: remove patch which is blocking core update
lazysoundsystem Sep 12, 2024
f28e7ec
Merge pull request #479 from UN-OCHA/OPS-10756-remove-patch
lazysoundsystem Sep 12, 2024
9c2a006
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins Sep 12, 2024
df125fa
Merge pull request #480 from UN-OCHA/update/patch-f28e7ec
lazysoundsystem Sep 12, 2024
8200f85
chore: Add tools
attiks Sep 16, 2024
ddddc17
chore: Add tools
attiks Sep 16, 2024
3123863
chore: Add tools
attiks Sep 17, 2024
bedae66
Merge pull request #481 from UN-OCHA/OPS-10867-tools
attiks Sep 17, 2024
720d5b6
Prepare deployment 17-09-2024
attiks Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

return [
'ignoreTypes' => ['build', 'ci', 'docs', 'refactor', 'revert', 'style', 'test'],
'tagPrefix' => 'v',
'tagSuffix' => '',
'commitUrlFormat' => '{{host}}/{{owner}}/{{repository}}/commit/{{hash}}',
'compareUrlFormat' => '{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}',
'issueUrlFormat' => 'https://humanitarian.atlassian.net/browse/{{id}}',
'hiddenVersionSeparator' => true,
];
2 changes: 1 addition & 1 deletion .docksal/docksal.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKSAL_STACK=default
DOCROOT=html
DB_IMAGE="docksal/db:1.1-mysql-5.7"
CLI_IMAGE='docksal/cli:php8.0-build'
CLI_IMAGE='docksal/cli:php8.2-build'
6 changes: 4 additions & 2 deletions .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +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_maintainers: ${{ vars.DRUPAL_MAINTAINERS }}
patch_branch: ${{ github.head_ref || github.ref_name }}
patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
slack_channel_name: ${{ vars.SLACK_CHANNEL }}
19 changes: 14 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@ jobs:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended

- name: PHP Logs
id: phplog
if: failure()
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal grep -i fatal /var/log/php/error.log

- name: Find Comment
uses: peter-evans/find-comment@v3
id: fc
Expand Down Expand Up @@ -197,16 +205,17 @@ jobs:
#### PHP Code Sniffer \`${{ steps.phpcs.outcome }}\`

<details><summary>Software Versions</summary>

\`\`\`${{ steps.versions.outputs.stdout }}\`\`\`

<code>${{ steps.versions.outputs.stdout }}</code>
</details>

<details><summary>Drupal Logs</summary>
<code>${{ steps.dblog.outputs.stdout }}</code>
</details>

\`\`\`${{ steps.dblog.outputs.stdout }}\`\`\`

<details><summary>PHP Logs</summary>
<code>${{ steps.phplog.outputs.stdout }}</code>
</details>

*Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Workflow: \`${{ github.workflow }}\`*`;
edit-mode: replace

Expand Down
Loading