Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DI-1355] Fix Code QL scanning #86

Merged
merged 19 commits into from
May 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .github/workflows/on-pullrequest-or-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ on:
branches:
- main
paths:
# TODO: restore this with AA-1601, except run in a PS-specific
# workflow, so that the C# build and CodeQL do not run
# unnecessarily.
# - "**/*.ps1"
# - "**/*.psm1"
- "**/*.ps1"
- "**/*.psm1"
- "**/*.cs"
- "**/*.csproj"
- ".github/**/*.yml"
Expand All @@ -26,6 +23,10 @@ on:
env:
DB_PASS: ${{ secrets.DB_PASS }}

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
run-ps-lint:
name: PowerShell Linter
Expand Down Expand Up @@ -61,10 +62,10 @@ jobs:

- name: Run Unit Tests
if: success()
run: ./build.ps1 -Command UnitTest -Configuration Release -Report True
run: ./build.ps1 -Command UnitTest -Configuration Release -Report True

- name: Integration Tests
run: ./build.ps1 -Command IntegrationTest -Configuration Release -Report True
run: ./build.ps1 -Command IntegrationTest -Configuration Release -Report True
shell: pwsh
env:
ConnectionStrings__defaultConnection: "Server=localhost,1433;Initial Catalog=EdFi_DataImport_Test;User Id=sa;Password=${{ env.DB_PASS }};Trusted_Connection=False;TrustServerCertificate=True;"
Expand All @@ -77,10 +78,6 @@ jobs:
path: "**/*.trx"
retention-days: 5

- name: Dependency Review ("Dependabot on PR")
if: github.event_name == 'pull_request'
uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3

code-analysis:
name: Code Analysis
runs-on: ubuntu-latest
Expand All @@ -102,7 +99,7 @@ jobs:
languages: csharp

- name: Rebuild for CodeQL
run: ./build.ps1 -Command Build -Configuration Release
run: ./build.ps1 Build -Configuration Release

- name: Perform CodeQL Analysis
if: success()
Expand Down