Skip to content

Commit

Permalink
Merge 7ab71e9 into b790f41
Browse files Browse the repository at this point in the history
  • Loading branch information
jesuyedavid committed May 13, 2024
2 parents b790f41 + 7ab71e9 commit 40526eb
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @yext/watson
6 changes: 3 additions & 3 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
name: Headless Acceptance
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- name: Download build-output-US artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-US
path: dist/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/acceptance_search_bar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jobs:
name: Headless Acceptance
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- name: Download build-output-US artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-US
path: dist/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- run: npm run ${{ inputs.build_script }}
- name: Create build-output-US artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-output-US
path: dist/
39 changes: 33 additions & 6 deletions .github/workflows/build_i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
Expand All @@ -36,11 +36,11 @@ jobs:
matrix:
language: ${{ fromJson(needs.create_language_matrix.outputs.matrix) }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
Expand All @@ -51,7 +51,34 @@ jobs:
npm run size
fi
- name: Create build-output-${{ inputs.cloud_region }} artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-output-${{ inputs.cloud_region }}
name: build-output-${{ inputs.cloud_region }}-${{ matrix.language }}
path: dist/

merge_multiple_artifacts:
needs: build
runs-on: ubuntu-latest
steps:
- name: Merge into build-output-${{ inputs.cloud_region }}-temp Artifact
uses: actions/upload-artifact/merge@v4
with:
name: build-output-${{ inputs.cloud_region }}-temp
pattern: build-output-${{ inputs.cloud_region }}-*
delete-merged: true

overwrite_artifact:
needs: merge_multiple_artifacts
runs-on: ubuntu-latest
steps:
- name: Download build-output-${{ inputs.cloud_region }}-temp artifact
uses: actions/download-artifact@v4
with:
name: build-output-${{ inputs.cloud_region }}-temp
path: dist/
- name: Overwrite build-output-${{ inputs.cloud_region }} artifact
uses: actions/upload-artifact@v4
with:
name: build-output-${{ inputs.cloud_region }}
path: dist/
overwrite: true
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
deploy-aws:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download build-output-US artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-US
path: dist/
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/deploy_hold.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
runs-on: ubuntu-latest
environment: production # sets in github repo with reviewer requirement protection rule
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download build-output-US artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-US
path: dist/
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -50,19 +50,19 @@ jobs:
runs-on: ubuntu-latest
environment: production # sets in github repo with reviewer requirement protection rule
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download build-output-EU artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-EU
path: dist/
- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@v0
uses: google-github-actions/auth@v2
with:
credentials_json: '${{ secrets.GCP_SA_KEY }}'
- name: Deploy to GCP Bucket
uses: google-github-actions/upload-cloud-storage@v0
uses: google-github-actions/upload-cloud-storage@v2
with:
path: dist/
parent: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
image: returntocorp/semgrep
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: semgrep ci
4 changes: 2 additions & 2 deletions .github/workflows/miscellaneous_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/should_deploy_major_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
outputs:
should_deploy_major_version: ${{ steps.vars.outputs.should_deploy_major_version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: allow for major version deployment if the next minor version from current tag does not exist
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- name: Download build-output-US artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-output-US
path: dist/
Expand Down

0 comments on commit 40526eb

Please sign in to comment.