Skip to content

Commit

Permalink
Merge branch 'dependabot/npm_and_yarn/types/react-18.3.8' of https://…
Browse files Browse the repository at this point in the history
…github.com/department-of-veterans-affairs/next-build into dependabot/npm_and_yarn/types/react-18.3.8
  • Loading branch information
mreed-maphabit committed Sep 29, 2024
2 parents c5847ba + bbe7dbb commit f6a4697
Show file tree
Hide file tree
Showing 36 changed files with 750 additions and 92 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/archive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
run: tar -c main/out/ -cf ${{ env.BUILD_TYPE }}.tar.bz2 .

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/content-release-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Content release: Dev"
on:
# Can be manually triggered
workflow_dispatch:
# Runs 5:05 am EDT Monday to Friday.
# This currently UTC -> EDT.
schedule:
- cron: "05 9 * * 1-5"
# Runs each time there is a new Production Tag created.
workflow_run:
workflows: ['Create Production Tag']
types: [completed]
branches: [main]

concurrency: next-build-content-release-dev

jobs:
content-release-dev:
# This job should run for any valid event besides workflow_run, or workflow_run if the conclusion was successful.
if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
uses: department-of-veterans-affairs/next-build/.github/workflows/content-release.yml@main
with:
build_type: "dev"
secrets: inherit


23 changes: 23 additions & 0 deletions .github/workflows/content-release-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "Content release: Prod"
on:
# Can be manually triggered
workflow_dispatch:
# Runs automatically every 30 minutes from 8am to 8pm Monday to Friday.
# This currently UTC -> EDT.
schedule:
- cron: "*/30 0,12-23 * * 1-5"
# Runs on API call. Used for CMS-driven build triggers.
repository_dispatch:
types: [content-release]

concurrency: next-build-content-release-prod

jobs:
content-release:
uses: department-of-veterans-affairs/next-build/.github/workflows/content-release.yml@main
with:
build_type: "prod"
secrets: inherit



26 changes: 26 additions & 0 deletions .github/workflows/content-release-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Content release: Staging"
on:
# Can be manually triggered
workflow_dispatch:
# Runs 5:35 am EDT Monday to Friday.
# This currently UTC -> EDT.
schedule:
- cron: "35 9 * * 1-5"
# Runs each time there is a new Production Tag created.
workflow_run:
workflows: ['Create Production Tag']
types: [completed]
branches: [main]

concurrency: next-build-content-release-staging

jobs:
content-release-staging:
# This job should run for any valid event besides workflow_run, or workflow_run if the conclusion was successful.
if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
uses: department-of-veterans-affairs/next-build/.github/workflows/content-release.yml@main
with:
build_type: "staging"
secrets: inherit


36 changes: 16 additions & 20 deletions .github/workflows/content-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,15 @@ permissions:
contents: read # This is required for actions/checkout

on:
repository_dispatch:
types: [content-release]
workflow_run:
workflows: ['Create Production Tag']
types: [completed]
branches: [main]
# Runs when called from other workflows. Used for ongoing releases for dev/staging/prod.
workflow_call:
inputs:
build_type:
type: string
description: "Environment this workflow runs against"
required: true
default: 'PROD'
# Manual release.
workflow_dispatch:
inputs:
build_type:
Expand All @@ -31,7 +27,7 @@ on:
- prod

concurrency:
group: ${{ inputs.build_type || 'prod' }}
group: ${{ inputs.build_type || 'prod' }}

env:
SLACK_CHANNEL: C06DSBT7CBW #status-next-build
Expand All @@ -42,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down Expand Up @@ -107,7 +103,7 @@ jobs:
continue-on-error: true
with:
payload: '{"attachments": [{"color": "#2EB67D","blocks": [{"type": "section","text": {"type": "mrkdwn","text": "Stand by, content release for next-build coming up (using ${{ needs.validate-build-status.outputs.TAG }}). <https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}>"}}]}]}'
channel_id: ${{ env.SLACK_CHANNEL }}
channel_id: ${{ env.SLACK_CHANNEL }}
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

Expand All @@ -133,14 +129,14 @@ jobs:
env:
NODE_EXTRA_CA_CERTS: /etc/ssl/certs/ca-certificates.crt
APP_ENV: ${{ inputs.build_type || 'prod' }}


ports:
- 80
volumes:
- /etc/ssl/certs:/etc/ssl/certs
steps:

- name: Export setup start time
id: export-setup-start-time
run: echo SETUP_START_TIME=$(date +"%s") >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -208,12 +204,12 @@ jobs:
cd out
ls -l
fi
- name: Build sitemap
run: cd main && yarn build:sitemap

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand All @@ -237,7 +233,7 @@ jobs:
DEST: s3://next-content.dev.va.gov
- if: inputs.build_type == 'staging'
name: Deploy to S3
run: |
run: |
cd main && ./scripts/github-actions/deploy.sh -s $SRC -d $DEST -v
ls
cd out
Expand All @@ -251,8 +247,8 @@ jobs:
env:
SRC: ./out/
DEST: s3://next-content.www.va.gov
- if: inputs.build_type == ''

- if: inputs.build_type == ''
name: Deploy to S3
run: cd main && ./scripts/github-actions/deploy.sh -s $SRC -d $DEST -v
env:
Expand All @@ -262,7 +258,7 @@ jobs:
- name: Export deploy end time
id: export-deploy-end-time
run: echo DEPLOY_END_TIME=$(date +"%s") >> $GITHUB_OUTPUT

notify-success:
name: Notify Success
needs: [validate-build-status, build]
Expand All @@ -282,7 +278,7 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down Expand Up @@ -336,7 +332,7 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down Expand Up @@ -380,7 +376,7 @@ jobs:
METRIC_NAMESPACE: dsva_vagov.next_build
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4
#uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Get current timestamp
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gha-metrics-datadog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -25,7 +25,7 @@ jobs:
env_variable_name: GHA_CONTENT_BUILD_DATADOG_API_KEY

- name: Send GitHub Actions metrics to DataDog
uses: int128/datadog-actions-metrics@5dbc8b81eb6d1b3cbd24099ff83373df472e0e36 # v1.95.0
uses: int128/datadog-actions-metrics@85755d0566a4b458f10acbaf68661eb1060cb2fe # v1.96.0
with:
datadog-api-key: ${{ env.GHA_CONTENT_BUILD_DATADOG_API_KEY }}
collect-job-metrics: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
echo "IMAGE_TAG=$(cat tag.txt)" >> $GITHUB_ENV
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.event.deployment_status.state == 'success'
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/recurring-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/update-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
echo "IMAGE_TAG=$(cat tag.txt)" >> $GITHUB_ENV
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v4.0.2
with:
aws-region: us-gov-west-1
role-to-assume: ${{ vars.AWS_ASSUME_ROLE }}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/msw-npm-2.4.4-701fcac5a9-9942c90ffe.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit f6a4697

Please sign in to comment.