Skip to content

Commit fb7892a

Browse files
committed
asdf
1 parent 11b6dcb commit fb7892a

File tree

3 files changed

+14
-53
lines changed

3 files changed

+14
-53
lines changed

.github/workflows/linux-build.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,8 @@ jobs:
2727
- name: Setup Just
2828
uses: extractions/setup-just@v3
2929

30-
- name: Restore tools
31-
run: just restore-tools
32-
33-
- name: Restore NuGet packages
34-
run: just restore
35-
36-
- name: Build app
37-
run: just build-package
38-
39-
- name: Restore NuGet packages for tests
40-
run: just restore-tests
41-
42-
- name: Build tests
43-
run: just build-tests
44-
45-
- name: Run unit tests (.NET 8)
46-
run: just test Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
47-
48-
- name: Run transitive tests (.NET 8)
49-
run: just test Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj
30+
- name: Build and test
31+
run: just
5032

5133
- name: Locate nupkg
5234
id: pkg

.github/workflows/win-build.yml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,12 @@ jobs:
2828
- name: Setup Just
2929
uses: extractions/setup-just@v3
3030

31-
- name: Restore tools
32-
run: just restore-tools
33-
34-
- name: Restore NuGet packages
35-
run: just restore
36-
37-
- name: Build app
38-
run: just build-package
39-
40-
- name: Restore NuGet packages for tests
41-
run: just restore-tests
42-
43-
- name: Build tests
44-
run: just build-tests
45-
46-
- name: Run unit tests (.NET 8)
47-
shell: bash
48-
run: just test Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
49-
50-
- name: Run transitive tests (.NET 8)
51-
shell: bash
52-
run: just test Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj
31+
- name: Build and test
32+
run: just
5333

5434
- name: Locate nupkg
55-
shell: bash
5635
id: pkg
57-
run: just locate-nupkg "$GITHUB_OUTPUT"
36+
run: just locate-nupkg $env:GITHUB_OUTPUT
5837

5938
- uses: actions/upload-artifact@v4
6039
with:

justfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set shell := ["sh", "-cu"]
22
is-windows := `uname -s | grep -qi 'mingw\|msys' && echo true || echo false`
33

4-
# Full pipeline
5-
default: restore-tools test-all
4+
# Complete build and test
5+
default: test-all
66

77
find-msbuild:
88
powershell -NoProfile -Command '& { & "${env:ProgramFiles(x86)}\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe }'
@@ -12,7 +12,7 @@ restore-tools:
1212
dotnet tool restore
1313

1414
# Restore main solution packages
15-
restore:
15+
restore: restore-tools
1616
dotnet restore Rubjerg.Graphviz.sln
1717

1818
# Build main app
@@ -50,10 +50,10 @@ test-all: build-tests
5050
just test Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
5151
just test Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj
5252

53-
locate-nupkg GITHUB_OUTPUT: test-all
54-
echo "package=$(find . -name "Rubjerg.Graphviz.*.nupkg" | head -1)" >> {{GITHUB_OUTPUT}}
53+
locate-nupkg GITHUB_OUTPUT:
54+
echo "package=$(find . -name "Rubjerg.Graphviz.*.nupkg" | head -1)" >> "{{GITHUB_OUTPUT}}"
5555

56-
# Check for CRLF line endings (only reports changes)
56+
# Check for CRLF line endings
5757
check-line-endings:
5858
bash -c "git ls-files -- ':!GraphvizWrapper/graphvizfiles/*' ':!*.sh' | xargs unix2dos"
5959
git diff --exit-code
@@ -63,14 +63,14 @@ check-readme:
6363
git diff --exit-code -- README.md
6464

6565
# Check formatting in main solution
66-
check-format-main: restore-tools
66+
check-format-main:
6767
dotnet format whitespace --verify-no-changes -v diag Rubjerg.Graphviz.sln
6868

6969
# Check formatting in test solution
70-
check-format-tests: restore-tools
70+
check-format-tests:
7171
dotnet format whitespace --verify-no-changes -v diag Rubjerg.Graphviz.Tests.sln
7272

73-
# Check for leftover tags like FIX'NOW
73+
# Check for unfinished work
7474
check-fixme:
7575
bash -c "! git grep 'FIX''NOW'"
7676

0 commit comments

Comments
 (0)