Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
77a0e61
Verbiage change, small corrections and improvements
arpage Apr 10, 2026
c554be9
Add dev versions of db backup/restore actions
arpage Apr 22, 2026
4bdb3e7
Remove schedule from dev action
arpage Apr 22, 2026
bddd368
Merge branch 'develop' into feature/DIGITAL-725-db-backup-scripts
arpage Apr 22, 2026
d8b807c
Merge branch 'develop' into feature/DIGITAL-725-db-backup-scripts
arpage Apr 28, 2026
8ce1d6e
Updates nginx to 1.30.3 for waf
jacobaaronyeager Jun 23, 2026
fd268c9
Merge branch 'develop' into feature/DIGITAL-786-update-waf-to-1.30
akf Jun 23, 2026
451a356
Merge branch 'develop' into feature/DIGITAL-725-db-backup-scripts
jacobaaronyeager Jul 22, 2026
55b5e83
Bump the npm_and_yarn group across 1 directory with 6 updates
dependabot[bot] Jul 23, 2026
4802673
Update block--site-wrapper-usa-banner.html.twig
ToniBonittoGSA Jul 24, 2026
709517c
Merge pull request #481 from GSA/ToniBonittoGSA-patch-1
akf Jul 24, 2026
3b46b5a
Merge branch 'develop' into dependabot/npm_and_yarn/web/themes/custom…
akf Jul 24, 2026
8f4d643
Update _uswds-theme.scss
ToniBonittoGSA Jul 24, 2026
31c3fac
Merge pull request #480 from GSA/dependabot/npm_and_yarn/web/themes/c…
akf Jul 24, 2026
ebe9238
Bump postcss
dependabot[bot] Jul 24, 2026
47e69d8
Merge branch 'develop' into ToniBonittoGSA-patch-2
ToniBonittoGSA Jul 27, 2026
f69246a
add script to delete workflow run logs
arpage Jul 28, 2026
630110a
Drupal core update to 10.6.14
arpage Jul 28, 2026
9ef75c7
Merge pull request #485 from GSA/feature/DIGITAL-807-core-security-up…
akf Jul 29, 2026
0277b01
Merge pull request #482 from GSA/dependabot/npm_and_yarn/web/themes/c…
akf Jul 29, 2026
bc0eec0
Merge branch 'develop' into feature/DIGITAL-808-log-leak-remediation
akf Jul 29, 2026
a81826c
Merge pull request #484 from GSA/feature/DIGITAL-808-log-leak-remedia…
akf Jul 29, 2026
c513ebe
Merge branch 'develop' into ToniBonittoGSA-patch-2
akf Jul 29, 2026
e5ba028
Merge pull request #483 from GSA/ToniBonittoGSA-patch-2
akf Jul 29, 2026
32fea48
initial pass
jacobaaronyeager Jul 31, 2026
8b9a25e
Extra tweaks
jacobaaronyeager Jul 31, 2026
dc350df
Merge pull request #488 from GSA/feature/DIGITAL-817-blog-UX-template…
akf Jul 31, 2026
356f955
Merge branch 'develop' into feature/DIGITAL-786-update-waf-to-1.30
jacobaaronyeager Aug 3, 2026
ac16e37
Bump brace-expansion
dependabot[bot] Aug 5, 2026
a3d9ea8
Merge pull request #489 from GSA/dependabot/npm_and_yarn/web/themes/c…
akf Aug 6, 2026
4c1b2c6
Merge branch 'develop' into feature/DIGITAL-786-update-waf-to-1.30
akf Aug 6, 2026
6eb36bf
Merge pull request #457 from GSA/feature/DIGITAL-786-update-waf-to-1.30
akf Aug 6, 2026
351edbe
Merge pull request #487 from GSA/main
akf Aug 6, 2026
2e4b489
Merge branch 'develop' into feature/DIGITAL-725-db-backup-scripts
akf Aug 6, 2026
ab0cc6f
Merge pull request #418 from GSA/feature/DIGITAL-725-db-backup-scripts
akf Aug 6, 2026
4012b77
Updates "Performance Reports" link in footer
jacobaaronyeager Aug 10, 2026
172addf
Update block--site-wrapper-usa-banner.html.twig
ToniBonittoGSA Aug 10, 2026
2548ddb
Merge pull request #492 from GSA/ToniBonittoGSA-patch-banner-icon
akf Aug 10, 2026
b165c32
Merge branch 'develop' into feature/DIGITAL-759-performace-reports-fo…
akf Aug 10, 2026
c71b333
Merge pull request #491 from GSA/feature/DIGITAL-759-performace-repor…
akf Aug 10, 2026
5108da5
Merge pull request #494 from GSA/develop
akf Aug 11, 2026
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
132 changes: 132 additions & 0 deletions .github/workflows/database-backup-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
name: Database Backup

permissions:
contents: read

on:
workflow_call:
secrets:
CF_USER:
required: true
CF_PASSWORD:
required: true
CF_ORG:
required: true
PROJECT:
required: true
DATABASE_BACKUP_BASTION_NAME:
required: true

jobs:
startBastion:
name: Start Bastion
runs-on: ubuntu-latest
if: github.ref_protected == true
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env
run: |
BRANCH=develop
CF_SPACE="dev"

echo "BRANCH=${BRANCH}" | tee -a $GITHUB_ENV
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV

- name: Install basic dependencies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: |
source ./scripts/pipeline/cloud-gov-login.sh
- name: Start Bastion
env:
PROJECT: "${{ secrets.PROJECT }}"
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
run: |
cf start "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}" >/dev/null 2>&1
./scripts/pipeline/cloud-gov-wait-for-app-start.sh "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}"
backup-database:
runs-on: ubuntu-latest
continue-on-error: true
needs: startBastion
if: github.ref_protected == true
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env
run: |
BRANCH=develop
CF_SPACE="dev"

echo "BRANCH=${BRANCH}" | tee -a $GITHUB_ENV
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV

- name: Install basic dependencies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install AWSCLI
run: ./scripts/pipeline/deb-awscli.sh
- name: Install MySQL Client
run: ./scripts/pipeline/deb-mysql-client-install.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: |
source ./scripts/pipeline/cloud-gov-login.sh
- name: Backup Database
id: backup
shell: bash
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
run: |
export TIMESTAMP=$(date --utc +%FT%TZ | tr ':', '-')
source ./scripts/pipeline/database-backup.sh
stopBastion:
name: Stop Bastion
runs-on: ubuntu-latest
needs: backup-database
if: github.ref_protected == true && ${{ always() }}
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env
run: |
BRANCH=develop
CF_SPACE="dev"

echo "BRANCH=${BRANCH}" | tee -a $GITHUB_ENV
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV

- name: Install basic dependencies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: |
source ./scripts/pipeline/cloud-gov-login.sh
- name: Stop Bastion
env:
PROJECT: "${{ secrets.PROJECT }}"
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
run: |
cf stop "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}" >/dev/null 2>&1
141 changes: 141 additions & 0 deletions .github/workflows/database-restore-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
name: Database Restore

permissions:
contents: read

on:
workflow_dispatch:
inputs:
database_file_override:
description: "Path on S3 bucket to a specific database file to restore."
required: false
jobs:
start-bastion:
name: Start Bastion
runs-on: ubuntu-latest
if: ${{ always() }}
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env.BRANCH
run: |
echo "BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)" | tee -a $GITHUB_ENV
case ${BRANCH} in
develop)
CF_SPACE="dev"
;;
main)
CF_SPACE="prod"
;;
stage)
CF_SPACE="staging"
;;
esac
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV
- name: Install basic dependancies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: source ./scripts/pipeline/cloud-gov-login.sh
- name: Start Bastion
env:
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
PROJECT: "${{ secrets.PROJECT }}"
run: |
cf start "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}" >/dev/null 2>&1
./scripts/pipeline/cloud-gov-wait-for-app-start.sh "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}"
restore-database:
runs-on: ubuntu-latest
needs: start-bastion
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env.BRANCH
run: |
echo "BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)" | tee -a $GITHUB_ENV

case ${BRANCH} in
develop)
CF_SPACE="dev"
;;
main)
CF_SPACE="prod"
;;
stage)
CF_SPACE="staging"
;;
esac
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV
- name: Install basic dependancies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install AWSCLI
run: ./scripts/pipeline/awscli-install.sh
- name: Install MySQL Client
run: ./scripts/pipeline/deb-mysql-client-install.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: source ./scripts/pipeline/cloud-gov-login.sh
- name: Restore database
shell: bash
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
run: |
export S3_FILE_PATH=${{ github.event.inputs.database_file_override }}
source ./scripts/pipeline/s3-backup-download.sh
source ./scripts/pipeline/database-restore.sh
source ./scripts/pipeline/cloud-gov-post-deploy.sh
stop-bastion:
name: Stop Bastion
runs-on: ubuntu-latest
needs: restore-database
if: ${{ always() }}
steps:
- name: Checkout
uses: actions/checkout@v6.0.2
- name: Set env.BRANCH
run: |
echo "BRANCH=$(echo $GITHUB_REF | cut -d'/' -f 3)" | tee -a $GITHUB_ENV
case ${BRANCH} in
develop)
CF_SPACE="dev"
;;
main)
CF_SPACE="prod"
;;
stage)
CF_SPACE="staging"
;;
esac
echo "CF_SPACE=${CF_SPACE}" | tee -a $GITHUB_ENV
- name: Install basic dependancies
run: ./scripts/pipeline/deb-basic-deps.sh
- name: Install Cloudfoundry CLI
run: ./scripts/pipeline/deb-cf-install.sh
- name: Cloud.gov login
env:
CF_USER: "${{ secrets.CF_USER }}"
CF_PASSWORD: "${{ secrets.CF_PASSWORD }}"
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
run: source ./scripts/pipeline/cloud-gov-login.sh
- name: Stop Bastion
env:
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
PROJECT: "${{ secrets.PROJECT }}"
run: cf stop "${PROJECT}-${DATABASE_BACKUP_BASTION_NAME}-${CF_SPACE}" >/dev/null 2>&1
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"drupal/config_pages": "^2.19",
"drupal/config_split": "^2.0",
"drupal/content_moderation_notifications": "^3.8",
"drupal/core-composer-scaffold": "10.6.12",
"drupal/core-project-message": "10.6.12",
"drupal/core-recommended": "10.6.12",
"drupal/core-composer-scaffold": "10.6.14",
"drupal/core-project-message": "^10.6.14",
"drupal/core-recommended": "10.6.14",
"drupal/database_ssl_check": "^2.0",
"drupal/default_content": "^2.0@beta",
"drupal/disable_user_1_edit": "^1.6",
Expand Down
Loading