Skip to content

Commit

Permalink
revert workflow changes
Browse files Browse the repository at this point in the history
  • Loading branch information
psubram3 committed Jul 24, 2024
1 parent 07f1f20 commit 4a6f5d3
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ORIGIN=http://localhost:3005
ORIGIN=http://localhost:3000
PUBLIC_AERIE_FILE_STORE_PREFIX=/usr/src/app/merlin_file_store/
PUBLIC_GATEWAY_CLIENT_URL=http://localhost:9000
PUBLIC_GATEWAY_SERVER_URL=http://localhost:9000
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Mission Model Canary

on:
workflow_dispatch:
schedule:
- cron: '0 * * * *' # every hour at the top of the hour

jobs:
canary:
uses: ./.github/workflows/test.yml
with:
env: 'canary'
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
lint:
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
publish:
runs-on: self-hosted
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: self-hosted
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
python3 -m scrub.tools.parsers.translate_results /home/runner/work/aerie-ui/results/*.sarif /home/runner/work/aerie-ui/results/codeql.scrub ${{ github.workspace }} scrub
python3 -m scrub.tools.parsers.csv_parser /home/runner/work/aerie-ui/results
- name: Upload Security Scan Results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Security Scan Results
path: /home/runner/work/aerie-ui/results/*
34 changes: 17 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ on:
required: false

env:
AERIE_PASSWORD: '${{vars.AERIE_PASSWORD}}'
AERIE_USERNAME: '${{vars.AERIE_USERNAME}}'
HASURA_GRAPHQL_ADMIN_SECRET: '${{vars.HASURA_GRAPHQL_ADMIN_SECRET}}'
HASURA_GRAPHQL_JWT_SECRET: '${{vars.HASURA_GRAPHQL_JWT_SECRET}}'
POSTGRES_USER: '${{vars.POSTGRES_USER}}'
POSTGRES_PASSWORD: '${{vars.POSTGRES_PASSWORD}}'
GATEWAY_USERNAME: '${{vars.GATEWAY_USERNAME}}'
GATEWAY_PASSWORD: '${{vars.GATEWAY_PASSWORD}}'
MERLIN_USERNAME: '${{vars.MERLIN_USERNAME}}'
MERLIN_PASSWORD: '${{vars.MERLIN_PASSWORD}}'
SCHEDULER_USERNAME: '${{vars.SCHEDULER_USERNAME}}'
SCHEDULER_PASSWORD: '${{vars.SCHEDULER_PASSWORD}}'
SEQUENCING_USERNAME: '${{vars.SEQUENCING_USERNAME}}'
SEQUENCING_PASSWORD: '${{vars.SEQUENCING_PASSWORD}}'
AERIE_PASSWORD: '${{secrets.AERIE_PASSWORD}}'
AERIE_USERNAME: '${{secrets.AERIE_USERNAME}}'
HASURA_GRAPHQL_ADMIN_SECRET: '${{secrets.HASURA_GRAPHQL_ADMIN_SECRET}}'
HASURA_GRAPHQL_JWT_SECRET: '${{secrets.HASURA_GRAPHQL_JWT_SECRET}}'
POSTGRES_USER: '${{secrets.POSTGRES_USER}}'
POSTGRES_PASSWORD: '${{secrets.POSTGRES_PASSWORD}}'
GATEWAY_USERNAME: '${{secrets.GATEWAY_USERNAME}}'
GATEWAY_PASSWORD: '${{secrets.GATEWAY_PASSWORD}}'
MERLIN_USERNAME: '${{secrets.MERLIN_USERNAME}}'
MERLIN_PASSWORD: '${{secrets.MERLIN_PASSWORD}}'
SCHEDULER_USERNAME: '${{secrets.SCHEDULER_USERNAME}}'
SCHEDULER_PASSWORD: '${{secrets.SCHEDULER_PASSWORD}}'
SEQUENCING_USERNAME: '${{secrets.SEQUENCING_USERNAME}}'
SEQUENCING_PASSWORD: '${{secrets.SEQUENCING_PASSWORD}}'

jobs:
unit-test:
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Checkout Repo (UI)
uses: actions/checkout@v4
Expand Down Expand Up @@ -66,13 +66,13 @@ jobs:
run: npm run test:unit:coverage
- name: Upload Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Unit Test Results
path: |
**/unit-test-results
e2e-test:
runs-on: self-hosted
runs-on: ubuntu-latest
environment: ${{ inputs.env || 'test-workflow' }}
steps:
- name: Checkout Repo (UI)
Expand Down

0 comments on commit 4a6f5d3

Please sign in to comment.