Skip to content

Commit

Permalink
Merge branch 'main' into feat/1520-404-page-not-found-screen-development
Browse files Browse the repository at this point in the history
  • Loading branch information
ngunner15 authored Oct 18, 2024
2 parents dee31a0 + abcc2c7 commit 8c5b3f9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/codeowners
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Matched against repo root (asterisk)
* @RMCampos @mgaseta @Ding-x @DerekRoberts @SLDonnelly
* @xiaopeng0202 @mgaseta @DerekRoberts @SLDonnelly

# Matched against directories
/sync/ @ronrobb
/sync/ @franTarkenton

# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.26.0
uses: aquasecurity/trivy-action@0.27.0
with:
format: "sarif"
output: "trivy-results.sarif"
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/etl-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: ETL PROD

on:
schedule: [cron: "30 */2 * * *"] # Every other hour on the hour
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: false

jobs:
etl-prod:
environment: prod
name: ETL (PROD)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: Run ./sync/oc_run.sh
run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}
20 changes: 4 additions & 16 deletions .github/workflows/job-sync.yml → .github/workflows/etl-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ETL Sync
name: ETL TEST

on:
schedule: [cron: "0 */2 * * *"] # Every other hour on the hour
Expand All @@ -9,26 +9,14 @@ concurrency:
cancel-in-progress: false

jobs:
sync-test:
etl-test:
environment: test
name: Sync (TEST)
name: ETL (TEST)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: ETL (TEST)
- name: Run ./sync/oc_run.sh
run: ./sync/oc_run.sh test ${{ secrets.oc_token }}

sync-prod:
environment: prod
name: Sync (PROD)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"
- name: ETL (PROD)
run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}

0 comments on commit 8c5b3f9

Please sign in to comment.