Skip to content

Commit

Permalink
chore(ci): use newer workflow patterns
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts committed Jan 18, 2024
1 parent 036de3a commit 881394e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Pull Request

on:
pull_request:
workflow_dispatch:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
35 changes: 6 additions & 29 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,20 @@
name: Unit Tests and Analysis
name: Analysis

on:
push:
branches: [main]
merge_group:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
schedule:
- cron: "0 12 * * 0" # 3 AM PST = 12 PM UDT, runs sundays
workflow_dispatch:

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

jobs:
# tests:
# name: Unit Tests
# if: github.event_name != 'pull_request' || !github.event.pull_request.draft
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# dir: [api, frontend]
# include:
# - dir: api
# sonar_projectKey: bcgov_public-code_api
# token: SONAR_TOKEN_BACKEND
# - dir: frontend
# sonar_projectKey: bcgov_public-code_frontend
# token: SONAR_TOKEN_FRONTEND
# steps:
# - uses: bcgov-nr/action-test-and-analyse@v0.0.1
# with:
# commands: |
# npm ci
# npm run test:cov
# dir: ${{ matrix.dir }}
# sonar_args: >
# -Dsonar.exclusions=**/coverage/**,**/node_modules/**
# -Dsonar.organization=bcgov-sonarcloud
# -Dsonar.project.monorepo.enabled=true
# -Dsonar.projectKey=${{ matrix.sonar_projectKey }}
# sonar_project_token: ${{ secrets[matrix.token] }}

# https://github.com/marketplace/actions/aqua-security-trivy
trivy:
name: Trivy Security Scan
Expand Down

0 comments on commit 881394e

Please sign in to comment.