Skip to content

Commit

Permalink
* change the hardcoded input dotnet-versionof `actions/setup-dotnet…
Browse files Browse the repository at this point in the history
…@v4` to `global-json-file`

* add hash for file `c#/.config/dotnet-tools.json` in the input `key` of `actions/cache/restore@v4`
* replace the run `dotnet new globaljson` with `dotnet tool restore`
* add `--locked-mode` param for run `dotnet restore`
@ actions/c#/action.yml

+ env `NUGET_PACKAGES` to use worker-level preinstalled NuGet packages
+ run `jb inspectcode` over the whole solution and upload its output file to `github/codeql-action/upload-sarif@v3`
@ workflows/c#.yml
@ .github

$ dotnet new globaljson --sdk-version 8.0.0 # then set `rollForward: latestMinor`
$ dotnet new tool-manifest && dotnet tool install JetBrains.ReSharper.GlobalTools
@ c#
  • Loading branch information
n0099 committed Mar 23, 2024
1 parent fcd4971 commit b43ce4f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/actions/c#/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
submodules: true
- uses: actions/setup-dotnet@v4
with: # https://github.com/actions/setup-dotnet/tree/v4
dotnet-version: 7
global-json-file: c#/global.json
# cache: true
# # https://github.com/actions/setup-node/issues/624#issuecomment-1328681525
# cache-dependency-path: ${{ github.workspace }}/c#/*/packages.lock.json
Expand All @@ -19,13 +19,14 @@ runs:
uses: actions/cache/restore@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
key: ${{ runner.os }}-nuget-${{ hashFiles('c#/*/packages.lock.json') }}-${{ hashFiles('c#/.config/dotnet-tools.json') }}
restore-keys: ${{ runner.os }}-nuget-

- run: dotnet new globaljson --sdk-version 7.0.405
- run: dotnet restore --locked-mode
working-directory: c#
shell: bash
- run: dotnet restore

- run: dotnet tool restore
working-directory: c#
shell: bash

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/c#.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ jobs:
strategy:
matrix:
project: [crawler, imagePipeline, shared, tbClient]
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/c#
- run: dotnet build --no-restore -c Debug ${{ matrix.project }}
- run: dotnet tool run jb inspectcode --build -f=sarif -o=sarif.json tbm.sln
- uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: sarif.json
12 changes: 12 additions & 0 deletions c#/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2023.3.4",
"commands": [
"jb"
]
}
}
}
6 changes: 6 additions & 0 deletions c#/global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMinor"
}
}

0 comments on commit b43ce4f

Please sign in to comment.