Skip to content

Commit 4f11315

Browse files
authored
Merge pull request #424 from neozhu/neozhu-patch-6
Update dotnet.yml
2 parents bf31882 + c3ea208 commit 4f11315

File tree

2 files changed

+10
-30
lines changed

2 files changed

+10
-30
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,12 @@ on:
2323
jobs:
2424
analyze:
2525
name: Analyze
26-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
27-
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
26+
runs-on: ubuntu-latest
2827
permissions:
2928
actions: read
3029
contents: read
3130
security-events: write
3231

33-
strategy:
34-
fail-fast: false
35-
matrix:
36-
language: [ 'csharp', 'javascript' ]
37-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
38-
# Use only 'java' to analyze code written in Java, Kotlin or both
39-
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
40-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4132

4233
steps:
4334
- name: Checkout repository
@@ -46,15 +37,6 @@ jobs:
4637
# Initializes the CodeQL tools for scanning.
4738
- name: Initialize CodeQL
4839
uses: github/codeql-action/init@v2
49-
with:
50-
languages: ${{ matrix.language }}
51-
# If you wish to specify custom queries, you can do so here or in a config file.
52-
# By default, queries listed here will override any specified in a config file.
53-
# Prefix the list here with "+" to use these queries and those in the config file.
54-
55-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
56-
# queries: security-extended,security-and-quality
57-
5840

5941
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6042
# If this step fails, then you should remove it and run the build manually (see below)
@@ -73,5 +55,3 @@ jobs:
7355

7456
- name: Perform CodeQL Analysis
7557
uses: github/codeql-action/analyze@v2
76-
with:
77-
category: "/language:${{matrix.language}}"

.github/workflows/dotnet.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212

1313
runs-on: ubuntu-latest
14-
services:
14+
services:
1515
sql:
1616
image: mcr.microsoft.com/mssql/server
1717
ports:
@@ -20,18 +20,18 @@ jobs:
2020
SA_PASSWORD: Your_password123
2121
ACCEPT_EULA: Y
2222

23-
steps:
23+
steps:
2424
- uses: actions/checkout@v3
2525
- name: Setup .NET
2626
uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 6.0.x
28+
dotnet-version: 7.0.x
2929
- name: Restore dependencies
30-
run: dotnet restore
30+
run: dotnet restore CleanArchitecture.Blazor.sln
3131
- name: Build
32-
run: dotnet build --no-restore
33-
- name: Test
34-
run: dotnet test --no-build --verbosity normal
35-
env:
32+
run: dotnet build CleanArchitecture.Blazor.sln --no-restore --configuration Release
33+
# - name: Test
34+
# run: dotnet test CleanArchitecture.Blazor.sln --no-build --configuration Release --filter "FullyQualifiedName!~AcceptanceTests"
35+
env:
3636
DatabaseSettings__DBProvider: mssql
37-
ConnectionStrings__ConnectionString: Server=.;Database=BlazorDashboardDb-Test;User=sa;Password=Your_password123;MultipleActiveResultSets=true;Encrypt=false;
37+
ConnectionStrings__ConnectionString: Server=.;Database=BlazorDashboardDb.Test;User=sa;Password=Your_password123;MultipleActiveResultSets=true;Encrypt=false;

0 commit comments

Comments
 (0)