Merge pull request #140 from UN-OCHA/develop

Deploy 18-9-2024
UN-OCHA · Sep 17, 2024 · 29ea0fe · 29ea0fe
2 parents 073641b + 79b8068
commit 29ea0fe
Show file tree

Hide file tree

Showing 7 changed files with 772 additions and 449 deletions.
diff --git a/.changelog b/.changelog
@@ -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,
+];
diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml
@@ -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 }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -175,6 +175,14 @@ jobs:
           run: |
             docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show
 
+      - 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@v2
         if: ${{ !env.ACT }}
@@ -207,6 +215,9 @@ jobs:
             <details><summary>Drupal Logs</summary>
             <code>${{ steps.dblog.outputs.stdout }}</code>
             </details>
+            <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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,172 @@
+<!--- BEGIN HEADER -->
+# Changelog
+
+All notable changes to this project will be documented in this file.
+<!--- END HEADER -->
+
+## [1.2.2](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.2.1...v1.2.2) (2024-08-13)
+
+
+---
+
+## [1.2.1](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.2.0...v1.2.1) (2024-08-05)
+
+### Features
+
+* Remove claude ([c75e30](https://github.com/UN-OCHA/ai-summarize-site/commit/c75e3039ee8120d0fc9f5340c7543d0093d63dd5))
+
+
+---
+
+## [1.2.0](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.1.0...v1.2.0) (2024-08-05)
+
+### Features
+
+* Add Amazon Titan Premier ([af36be](https://github.com/UN-OCHA/ai-summarize-site/commit/af36beae24aaf448236702d5964bad413c043fd2))
+* Add more statistics ([a80708](https://github.com/UN-OCHA/ai-summarize-site/commit/a807085aca7686253e7128a9cba31c5e3c9c2d07), [37026f](https://github.com/UN-OCHA/ai-summarize-site/commit/37026f1ee6e724faf32e46ef2d1f1a4fd3d997ff))
+* Change wording when no summary is present [#OPS-10643](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10643) ([41390e](https://github.com/UN-OCHA/ai-summarize-site/commit/41390ef8c1e6a522e9060ff9f4a6e6265fb06130))
+* Email body [#OPS-10643](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10643) ([bc9bb0](https://github.com/UN-OCHA/ai-summarize-site/commit/bc9bb05dbb425478b7686d68ca3b5fc62d82dc24))
+* Remove claude ([80ef71](https://github.com/UN-OCHA/ai-summarize-site/commit/80ef719d343a509bbaf47b5a30185f6c60c38235))
+* Rename Azure AI ([748b3d](https://github.com/UN-OCHA/ai-summarize-site/commit/748b3d9556315a092b2ae6e4b1871202b7e96f84))
+
+
+---
+
+## [1.1.0](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.9...v1.1.0) (2024-07-17)
+
+
+---
+
+## [1.0.9](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.8...v1.0.9) (2024-06-18)
+
+### Features
+
+* Feedback form ([372329](https://github.com/UN-OCHA/ai-summarize-site/commit/372329a7481e126c8171734db53a9090cff4df09))
+* Feedback form copy button ([5ea85e](https://github.com/UN-OCHA/ai-summarize-site/commit/5ea85ed54f97e404a19412da5077440915dfbdae))
+* Log timing, add stats page, export and json ([6db80e](https://github.com/UN-OCHA/ai-summarize-site/commit/6db80e947b004b8a7be21fb71f4888383d0f37a4))
+
+### Bug Fixes
+
+* Add spaces for phpcs ([694849](https://github.com/UN-OCHA/ai-summarize-site/commit/69484970e69ddaf28f32612955f566244cdd45a2))
+* Undo composer change ([15a3fe](https://github.com/UN-OCHA/ai-summarize-site/commit/15a3fefd94981f511c81b5c04b2b4d70397f16dd))
+
+
+---
+
+## [1.0.8](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.7...v1.0.8) (2024-05-13)
+
+
+---
+
+## [1.0.7](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.6...v1.0.7) (2024-04-24)
+
+
+---
+
+## [1.0.6](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.5...v1.0.6) (2024-04-18)
+
+
+---
+
+## [1.0.5](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.4...v1.0.5) (2024-04-05)
+
+
+---
+
+## [1.0.4](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.3...v1.0.4) (2024-04-05)
+
+
+---
+
+## [1.0.3](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.2...v1.0.3) (2024-04-05)
+
+### Features
+
+* Message, always auto mode ([6fb4ae](https://github.com/UN-OCHA/ai-summarize-site/commit/6fb4aeb303b8632e049b3333ff22637a053b542b))
+
+
+---
+
+## [1.0.2](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.1...v1.0.2) (2024-04-05)
+
+
+---
+
+## [1.0.1](https://github.com/UN-OCHA/ai-summarize-site/compare/v1.0.0...v1.0.1) (2024-04-04)
+
+
+---
+
+## [1.0.0](https://github.com/UN-OCHA/ai-summarize-site/compare/v0.1.3...v1.0.0) (2024-04-04)
+
+### Features
+
+* Allow activate on user during sign up ([8d605c](https://github.com/UN-OCHA/ai-summarize-site/commit/8d605c7194dbb425aff3dec1c653bf3d753017d0))
+
+
+---
+
+## [0.1.3](https://github.com/UN-OCHA/ai-summarize-site/compare/v0.1.2...v0.1.3) (2024-04-04)
+
+### Features
+
+* Update wording [#OPS-10197](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10197) ([eea76f](https://github.com/UN-OCHA/ai-summarize-site/commit/eea76ffd38808b910df0e56c3d93120253ff1019))
+
+
+---
+
+## [0.1.2](https://github.com/UN-OCHA/ai-summarize-site/compare/v0.1.1...v0.1.2) (2024-03-28)
+
+### Features
+
+* Auto approve un.org users [#OPS-10189](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10189) ([85fdb0](https://github.com/UN-OCHA/ai-summarize-site/commit/85fdb02fa7538fdd7d9fb66832acfbd4b3374200))
+* Create account [#OPS-10197](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10197) ([50a75a](https://github.com/UN-OCHA/ai-summarize-site/commit/50a75add1bf9c62b0aa711b5c5907b8b2251456c))
+* Edit screen, comments, email [#OPS-10199](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10199) ([26d2b5](https://github.com/UN-OCHA/ai-summarize-site/commit/26d2b5e833a5f9b323155f35719cc589314d7468))
+* Home page [#OPS-10197](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10197), [#OPS-10196](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10196) ([b3d65f](https://github.com/UN-OCHA/ai-summarize-site/commit/b3d65fbf0202b939b7dde93fcaefcdbb08a3d690), [67e32d](https://github.com/UN-OCHA/ai-summarize-site/commit/67e32d92dbc28cf4492f5034b0cfd3dd6cd518d2))
+* Separate home page [#OPS-10197](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-10197) ([45ef6a](https://github.com/UN-OCHA/ai-summarize-site/commit/45ef6a9ea3ebf6171a07cea9dda113fffad67a90))
+
+### Bug Fixes
+
+* Do not break security check builds on abandoned packages. They need to be addressed upstream. (#46) ([a32e6c](https://github.com/UN-OCHA/ai-summarize-site/commit/a32e6c064840f3bdc324bab0bf215c72b1f8f15b))
+* If we had tests this would be less painful. ([f9bfd3](https://github.com/UN-OCHA/ai-summarize-site/commit/f9bfd3b2a9cb6021cc20896d43b7cc0130f80ab4))
+* Load the file storage correctly, fix the log messages. ([fef13a](https://github.com/UN-OCHA/ai-summarize-site/commit/fef13ad35dfc29f64b9b8e4b482fe95d11671953))
+
+
+---
+
+## [0.1.1](https://github.com/UN-OCHA/ai-summarize-site/compare/v0.1.0...v0.1.1) (2024-03-20)
+
+### Features
+
+* Ensure the queue entries contain the filename, so we can log it :-) ([df51e9](https://github.com/UN-OCHA/ai-summarize-site/commit/df51e9eb014aa9a7580d4062216dd507839351e2))
+
+
+---
+
+## [0.1.0](https://github.com/UN-OCHA/ai-summarize-site/compare/dd05c41fca71c4ff1181ed869264fb0f0b877626...v0.1.0) (2024-03-18)
+
+### Features
+
+* Ask for feedback ([c9357e](https://github.com/UN-OCHA/ai-summarize-site/commit/c9357e687a369a202fe719f5c948e4a9619265b9))
+* BedRock support ([3a7569](https://github.com/UN-OCHA/ai-summarize-site/commit/3a75699b99767d226849a387494f3ed5d575fa43), [6b908a](https://github.com/UN-OCHA/ai-summarize-site/commit/6b908ad40aa391167ce79decb4cdbc826f76d264))
+* Choose brain, automatic mode ([b30126](https://github.com/UN-OCHA/ai-summarize-site/commit/b30126c280c2bfbc67780f6d20f265e6d4c65287))
+* Compare action points ([db07c1](https://github.com/UN-OCHA/ai-summarize-site/commit/db07c19dcbba5a6ae366b441777363af7d84ce20))
+* Compare documents ([e872d9](https://github.com/UN-OCHA/ai-summarize-site/commit/e872d9018610a6d3167b70a35c0c9ceb648f77f4))
+* Compare link on all nodes ([20141b](https://github.com/UN-OCHA/ai-summarize-site/commit/20141bed46b67a18094f73fde28f11361abbfe44))
+* Require mailsystem, amazon_ses and aws so we can use role auth and the ses API to send email. ([75c3be](https://github.com/UN-OCHA/ai-summarize-site/commit/75c3bece604d0a0899b49341c4a4132ac52432a5))
+* Run everything obviously [#OPS-9633](https://github.com/UN-OCHA/ai-summarize-site/issues/OPS-9633) ([66237b](https://github.com/UN-OCHA/ai-summarize-site/commit/66237bb20d687215b470eef4f1044e4a3a02a617))
+* Style compare link on all nodes ([9b29f3](https://github.com/UN-OCHA/ai-summarize-site/commit/9b29f3ad41b55ec232752ccd4137f1d20dab41c8))
+* Use AWS Textract ([f6530f](https://github.com/UN-OCHA/ai-summarize-site/commit/f6530f96edda38e9c0061ecd3df230bce8ac92b5))
+* Use comments for feedback ([c27f25](https://github.com/UN-OCHA/ai-summarize-site/commit/c27f25ce30b0464bc85f12c01a83218cb5fd184c))
+
+### Bug Fixes
+
+* Allow composer to run as root. ([75db26](https://github.com/UN-OCHA/ai-summarize-site/commit/75db26279df3284925ab4c801bc8c4741d14f876))
+* Ensure generated settings are (re-)loaded if needed, so sanity checks can see them and not fail. ([af4c79](https://github.com/UN-OCHA/ai-summarize-site/commit/af4c796d6cfdb84f72fd186a54f6e879d2fbfd31))
+* Explicitly set perms, so dependabot can run code coverage. ([0e3245](https://github.com/UN-OCHA/ai-summarize-site/commit/0e3245c7fadffc8411f1490578ec350459353176))
+* Oops ([2f1cfb](https://github.com/UN-OCHA/ai-summarize-site/commit/2f1cfb5c6d97de1bc00b966d88ac17b36ac9465d))
+* Use a sensible snippet, with doc block. ([1d09c8](https://github.com/UN-OCHA/ai-summarize-site/commit/1d09c8b23705f337f1c86ce40ec1b72bc4a53e9c))
+
+
+---
+
diff --git a/composer.json b/composer.json
@@ -70,6 +70,7 @@
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
+        "davidrjonas/composer-lock-diff": "^1.0",
         "drupal/coder": "^8.3",
         "drupal/config_inspector": "^2.1",
         "drupal/dev_mode": "^2.3",
@@ -166,7 +167,7 @@
                 },
                 "[web-root]/robots.txt": {
                     "append": "assets/robots.txt.append"
-               }
+                }
             },
             "locations": {
                 "web-root": "html/"
@@ -187,7 +188,7 @@
             ],
             "post-create-project-cmd-message": [
                 "<bg=blue;fg=white>                                                         </>",
-                "<bg=blue;fg=white>  Congratulations, you\u2019ve installed the Drupal codebase  </>",
+                "<bg=blue;fg=white>  Congratulations, you’ve installed the Drupal codebase  </>",
                 "<bg=blue;fg=white>  from the drupal/recommended-project template!          </>",
                 "<bg=blue;fg=white>                                                         </>",
                 "",
@@ -244,5 +245,6 @@
         "pre-pool-create": [
             "scripts\\composer\\DrupalLenientRequirement::changeVersionConstraint"
         ]
-    }
-}
+    },
+    "version": "1.2.3"
+}