Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
fzhao99 committed Dec 8, 2023
2 parents 0266913 + a4aad41 commit d7fcc16
Show file tree
Hide file tree
Showing 336 changed files with 12,398 additions and 12,491 deletions.
85 changes: 38 additions & 47 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
# Issue to track batching updates feature: https://github.com/github/roadmap/issues/148

version: 2
updates:

- package-ecosystem: "docker"
directory: "/"
open-pull-requests-limit: 2
schedule:
interval: "weekly"
day: "sunday"
reviewers:
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/backend"
open-pull-requests-limit: 2
schedule:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-backendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/backend/db-setup"
Expand All @@ -21,9 +28,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-backendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/cypress"
Expand All @@ -32,9 +38,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/frontend"
Expand All @@ -43,9 +48,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/nginx"
Expand All @@ -54,9 +58,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-backendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "docker"
directory: "/ops/services/container_instances/db_client/image"
Expand All @@ -65,21 +68,18 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-backendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "github-actions"
# this checks the .github/workflows directory by default
# any other directory for github-actions seems broken at the moment
directory: "/"
open-pull-requests-limit: 2
schedule:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "gradle"
directory: "/backend"
Expand All @@ -88,9 +88,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-backendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "npm"
directory: "/"
Expand All @@ -99,9 +98,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "npm"
directory: "/frontend"
Expand All @@ -110,9 +108,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "npm"
directory: "/cypress"
Expand All @@ -121,9 +118,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "npm"
directory: "/ops/services/app_functions/report_stream_batched_publisher/functions"
Expand All @@ -132,9 +128,8 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-frontendreviews"
- "cdcgov/simplereport-devsecops"
- "cdcgov/simplereport-engineeringreviews"

- package-ecosystem: "terraform"
directory: "/ops/global"
Expand All @@ -143,8 +138,7 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-devsecops"

- package-ecosystem: "terraform"
directory: "/ops/services/okta-global"
Expand All @@ -153,8 +147,7 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-devsecops"

- package-ecosystem: "terraform"
directory: "/ops/test"
Expand All @@ -163,8 +156,7 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-devsecops"

- package-ecosystem: "terraform"
directory: "/ops/test/persistent"
Expand All @@ -173,5 +165,4 @@ updates:
interval: "weekly"
day: "sunday"
reviewers:
- "alismx"
- "rin-skylight"
- "cdcgov/simplereport-devsecops"
2 changes: 1 addition & 1 deletion .github/workflows/checkGraphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{env.NODE_VERSION}}
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: ${{env.NODE_VERSION}}
- name: Cache yarn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
fetch-depth: 0 # Chromatic wants the history

- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
with:
node-version: ${{ env.NODE_VERSION }}

Expand All @@ -35,7 +35,7 @@ jobs:

- name: Publish to Chromatic
if: github.ref != 'refs/heads/main'
uses: chromaui/action@v1
uses: chromaui/action@v10
with:
workingDir: frontend
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Publish to Chromatic (auto-accept changes on merge main)
if: github.ref == 'refs/heads/main'
uses: chromaui/action@v1
uses: chromaui/action@v10
with:
workingDir: frontend
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
queries: +security-and-quality

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{env.JAVA_VERSION}}
distribution: ${{env.JAVA_DISTRIBUTION}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
with:
node-version: ${{env.NODE_VERSION}}
- name: Cache npm local files
Expand All @@ -42,7 +42,7 @@ jobs:
run: yarn install
working-directory: ./frontend
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{env.JAVA_VERSION}}
distribution: ${{env.JAVA_DISTRIBUTION}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
working-directory: ./frontend
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3.8.1
- uses: actions/setup-node@v4.0.0
with:
node-version: ${{env.NODE_VERSION}}
- uses: azure/login@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/terraformChecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v2.0.3
- uses: hashicorp/setup-terraform@v3.0.0
with:
terraform_version: 1.3.3
- name: Terraform fmt
Expand All @@ -35,7 +35,7 @@ jobs:
global
steps:
- uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v2.0.3
- uses: hashicorp/setup-terraform@v3.0.0
with:
terraform_version: 1.3.3
- name: Terraform Init
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
- uses: hashicorp/setup-terraform@v2.0.3
- uses: hashicorp/setup-terraform@v3.0.0
if: ${{ github.actor != 'dependabot[bot]' }}
with:
terraform_version: 1.3.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraformPlan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
if: ${{ matrix.env == 'prod' || matrix.env == 'stg' || matrix.env == 'training' }}
run: |
echo "OKTA_API_TOKEN=${{ secrets.OKTA_API_TOKEN }}" >> "$GITHUB_ENV"
- uses: hashicorp/setup-terraform@v2.0.3
- uses: hashicorp/setup-terraform@v3.0.0
with:
terraform_version: 1.3.3
- name: Terraform Init
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Cache yarn
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
ops/services/app_functions/report_stream_batched_publisher/functions/coverage/**
key: ${{ runner.os }}-function-coverage-${{ github.run_id }}-${{ github.run_attempt }}
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
Expand All @@ -163,7 +163,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
Expand All @@ -181,7 +181,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
Expand All @@ -199,7 +199,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Cache yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updateGradleLocks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0 # Disable shallow clones: we need to be able to push

- name: Set up JDK ${{env.JAVA_VERSION}}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{env.JAVA_VERSION}}
distribution: ${{env.JAVA_DISTRIBUTION}}
Expand Down
Loading

0 comments on commit d7fcc16

Please sign in to comment.