11.3.0

SU-HSDO · Oct 3, 2024 · 6bca7d6 · 6bca7d6
2 parents e0e1d69 + b78480d
commit 6bca7d6
Show file tree

Hide file tree

Showing 187 changed files with 1,354 additions and 42,462 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -80,9 +80,7 @@ update_dependencies: &update_dependencies
           drush config:export -y &&
           git add config composer.lock docroot &&
           git commit -m "Updated dependencies $DATE" &&
-          git push origin $CIRCLE_BRANCH &&
-          blt humsci:clean-backups &&
-          blt humsci:clean-branches
+          git push origin $CIRCLE_BRANCH
     - save_cache: *save_cache
 
 # Declare all the jobs we should run.

diff --git a/.github/workflows/acquia-cleanup.yml b/.github/workflows/acquia-cleanup.yml
@@ -0,0 +1,37 @@
+# .github/workflows/acquia-cleanup.yml
+# Clean up stale site backups and branches on Acquia
+name: Acquia Cleanup
+on:
+  schedule:
+    # Run on Tuesdays at Midnight (Monday Nights)
+    - cron: '0 0 * * 2'
+jobs:
+  acquia_cleanup:
+    runs-on: ubuntu-latest
+    container:
+      image: pookmish/drupal8ci:latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Restore Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+            docroot/core
+            docroot/libraries
+            docroot/modules/contrib
+          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          restore-keys: |
+            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.x-${{ hashFiles('blt/blt.yml') }}-
+      - name: Clean up backups and branches
+        env:
+          SLACK_NOTIFICATION_URL: ${{ secrets.SLACK_NOTIFICATION_URL }}
+          ACQUIA_KEY: ${{ secrets.ACQUIA_KEY }}
+          ACQUIA_SECRET: ${{ secrets.ACQUIA_SECRET }}
+        run: |
+          composer install -n &&
+          blt blt:telemetry:disable --no-interaction &&
+          blt humsci:clean-backups &&
+          blt humsci:clean-branches
diff --git a/blt/blt.yml b/blt/blt.yml
@@ -48,14 +48,11 @@ modules:
 multisites:
   - aaai
   - aaas
-  - aarc
   - aarcs
   - africanstudies
   - amstudies
   - anthropology
-  - antiracismlab
   - archaeology
-  - archaeology2023
   - art
   - artexhibitions
   - arthandbook
@@ -65,7 +62,6 @@ multisites:
   - bsurp
   - buddhiststudies
   - ccsre
-  - ccsre2023
   - ceas
   - cesta
   - chemistry
@@ -80,7 +76,6 @@ multisites:
   - datasciencemajor
   - default
   - dennylab
-  - dfetter__humsci
   - dlcl
   - dsresearch
   - duboislab
@@ -90,7 +85,6 @@ multisites:
   - english
   - ethicsinsociety
   - facultyaffairs_humsci
-  - feldman
   - feminist
   - finance_humsci
   - francestanford
@@ -99,9 +93,7 @@ multisites:
   - globalcurrents
   - grandtour
   - gus_humsci
-  - heidi_williams__humsci
   - history
-  - hopkinsmarinestation
   - hps
   - hs_colorful
   - hs_design
@@ -115,11 +107,8 @@ multisites:
   - hsweb_referencetraditional
   - hsweb_userguide
   - humanbiology
-  - humanexperience
   - humanitiescore
   - humanrights
-  - iajs
-  - impact
   - insidehs
   - internationalrelations
   - iranianstudies
@@ -133,9 +122,7 @@ multisites:
   - linguistics
   - lowe
   - mathematics
-  - mathematics2024
   - mcs
-  - mcs2023
   - mediterraneanstudies
   - memorylab
   - middleeast
@@ -145,7 +132,6 @@ multisites:
   - music
   - oconnell
   - philit
-  - philit2023
   - philosophy
   - physics
   - planning_humsci
@@ -155,24 +141,19 @@ multisites:
   - ptarmigan
   - publichumanities
   - publicpolicy
-  - race
   - religiousstudies
   - researchadmin_humsci
-  - scl
   - sgs
   - shenlab
   - sitp
   - siw
   - sociology
   - southasia
   - stanfordsciencefellows
-  - starlab
   - statistics
   - sts
   - suac
-  - swshumsci_sandbox
   - symsys
-  - symsys2023
   - tessier_lavigne_lab
   - texttechnologies
   - urbanstudies

diff --git a/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php b/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php
@@ -140,7 +140,7 @@ public function humsciAddDomain($environment, $domains) {
   public function backupDatabases($options = ['start-at' => NULL]) {
     $this->connectAcquiaApi();
     $skip = TRUE;
-    foreach ($this->acquiaDatabases->getAll($this->appId) as $database) {
+    foreach ($this->acquiaDatabases->getNames($this->appId) as $database) {
       if (!empty($options['start-at']) && $skip) {
         if ($options['start-at'] == $database->name) {
           $skip = FALSE;
@@ -169,7 +169,7 @@ public function deleteOldBackups() {
       }
     }
 
-    foreach ($this->acquiaDatabases->getAll($this->appId) as $database) {
+    foreach ($this->acquiaDatabases->getNames($this->appId) as $database) {
       $this->say(sprintf('Gather database backup info for %s', $database->name));
 
       foreach ($environment_uuids as $environment_uuid => $name) {

diff --git a/composer.json b/composer.json
@@ -199,7 +199,8 @@
         "drupal/coder": "*"
     },
     "conflict": {
-        "drupal/drupal": "*"
+        "drupal/drupal": "*",
+        "drupal/readonly_field_widget": ">1.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,