diff --git a/.github/actions/dingorunner/entrypoint.sh b/.github/actions/dingorunner/entrypoint.sh index 105dca3fb..224153652 100644 --- a/.github/actions/dingorunner/entrypoint.sh +++ b/.github/actions/dingorunner/entrypoint.sh @@ -208,8 +208,20 @@ then storeKey terminusApi branch="${GITHUB_REF#refs/heads/}" - commands=$(cat robo/assets/md/$branch) + commands=$(cat robo/assets/md/$branch | tr -d '[:space:]') echo $commands terminus env:wake accessmatch.$branch + # Wait for any active Pantheon workflows (sync_code/deploy quicksilver) to finish + echo "Waiting for Pantheon workflows to complete..." + for i in $(seq 1 24); do + running=$(terminus workflow:list accessmatch.$branch --format=csv --fields=status 2>/dev/null | grep -c "running" || true) + if [ "$running" = "0" ]; then + echo "Workflows complete." + break + fi + echo "Workflow still running... attempt $i" + sleep 15 + done terminus remote:drush accessmatch.$branch -- domain:default $commands + echo "Set domain to: $commands" fi diff --git a/README.md b/README.md index 05eec6562..3f7a83c78 100755 --- a/README.md +++ b/README.md @@ -237,4 +237,3 @@ The email secret is the email you use with pantheon and the token can be setup u You can create, open, and ssh into your codespaces using Github CLI, see [install instructions](https://github.com/cli/cli#installation) to install on your local system. Once installed check out the [documentation](https://docs.github.com/en/codespaces/developing-in-codespaces/using-github-codespaces-with-github-cli) for commands you can use. You can authorize Github CLI by running the following command: ```gh auth login``` - diff --git a/composer.lock b/composer.lock index 2663f3d16..690b98c3a 100644 --- a/composer.lock +++ b/composer.lock @@ -102,7 +102,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "6c40e3626638f2bb47f17a2413f1fd939bda6b4e" + "reference": "830e34a307b8c32f50c599effbd95949f34f5ef5" }, "require": { "firebase/php-jwt": "^6.0 || ^7.0", @@ -125,7 +125,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2026-04-15T16:23:39+00:00" + "time": "2026-04-23T04:01:08+00:00" }, { "name": "arthurkushman/query-path", @@ -13289,7 +13289,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "0a8ce13fb842c381004e52f7d3558ca996848ceb" + "reference": "e2bd61b3a404387fbb5a15db5bf5d9c30c652583" }, "default-branch": true, "type": "drupal-theme", @@ -13307,7 +13307,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2026-04-10T17:14:56+00:00" + "time": "2026-04-23T03:50:10+00:00" }, { "name": "necyberteam/campus-champions-theme", diff --git a/robo/assets/md/md-2686 b/robo/assets/md/md-2686 deleted file mode 100644 index d7db02ba2..000000000 --- a/robo/assets/md/md-2686 +++ /dev/null @@ -1 +0,0 @@ -amp_cyberinfrastructure_org diff --git a/robo/assets/md/md-2649 b/robo/assets/md/md-2701 similarity index 100% rename from robo/assets/md/md-2649 rename to robo/assets/md/md-2701 diff --git a/web/private/scripts/drush_deploy/drush_deploy.php b/web/private/scripts/drush_deploy/drush_deploy.php index b00caa3f1..fecea525a 100644 --- a/web/private/scripts/drush_deploy/drush_deploy.php +++ b/web/private/scripts/drush_deploy/drush_deploy.php @@ -2,7 +2,4 @@ echo "Running drush deploy...\n"; passthru('drush deploy'); -echo "Import of configuration complete.\n"; -echo "Rebuilding cache.\n"; -passthru('drush cr'); -echo "Rebuilding cache complete.\n"; +echo "drush deploy complete.\n"; diff --git a/web/sites/default/config/default/views.view.cssn_directory.yml b/web/sites/default/config/default/views.view.cssn_directory.yml index 7c0ce78b9..00d856431 100644 --- a/web/sites/default/config/default/views.view.cssn_directory.yml +++ b/web/sites/default/config/default/views.view.cssn_directory.yml @@ -841,7 +841,7 @@ display: exclude: false alter: alter_text: true - text: "{{ field_user_badges }}\r\n