Skip to content

Commit f4babe7

Browse files
authored
doing standards maybe 2morrow
1 parent 4e7bfbd commit f4babe7

3 files changed

Lines changed: 381 additions & 167 deletions

File tree

.github/workflows/dotnet_build_release.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,43 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ windows-latest, ubuntu-latest, macos-latest ]
15-
arch: [ x64, x86 ]
15+
arch: [ x64, x86, arm64 ]
1616
exclude:
1717
- os: macos-latest
1818
arch: x86
1919
- os: windows-latest
2020
arch: x86
21-
21+
- os: ubuntu-latest
22+
arch: x86
23+
- os: ubuntu-latest
24+
arch: arm64
25+
2226
steps:
2327
# Checkout the repo
2428
- uses: actions/checkout@v4
2529

2630
- name: Setup .NET
2731
uses: actions/setup-dotnet@v4
2832
with:
29-
dotnet-version: '8.0.x'
33+
dotnet-version: '10.0.x'
3034

3135
- name: Build solution (Windows)
3236
if: matrix.os == 'windows-latest' && matrix.arch == 'x64'
33-
run: dotnet build RedSeaMarkupLanguage.sln -c Release -p:Platform=${{ matrix.arch }}
37+
run: dotnet build RedSeaMarkupLanguage.slnx -c Release -p:Platform=${{ matrix.arch }}
3438

3539
- name: Build solution (Linux and MacOS)
3640
if: matrix.os != 'windows-latest'
37-
run: dotnet build RedSeaMarkupLanguage.sln -c Release -p:Platform=${{ matrix.arch }}
41+
run: dotnet build RedSeaMarkupLanguage.slnx -c Release -p:Platform=${{ matrix.arch }}
3842

3943
- name: Run tests
40-
run: dotnet test ./RSML.Tests/RSML.Tests.csproj -c Release --no-build
44+
run: dotnet test ./tests/RSML.Tests.csproj -c Release --no-build
4145

4246
- name: Pack & push to NuGet
4347
if: github.event_name == 'push' && matrix.os == 'windows-latest' && matrix.arch == 'x64'
4448
shell: pwsh
4549
run: |
4650
ls .
47-
dotnet pack ./RSML/RSML.csproj -c Release -o ./nupkg
51+
dotnet pack ./src/RSML/RSML.csproj -c Release -o ./nupkg
4852
ls .
4953
ls ./nupkg/
5054
Get-ChildItem -Path ./nupkg -Filter *.nupkg | ForEach-Object {
@@ -58,7 +62,7 @@ jobs:
5862
if: matrix.os == 'windows-latest' && matrix.arch == 'x64'
5963
shell: pwsh
6064
run: |
61-
dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r win-${{ matrix.arch }} --self-contained true -o publish
65+
dotnet publish ./src/RSML.CLI/RSML.CLI.csproj -c Release -r win-${{ matrix.arch }} --self-contained true -o publish
6266
cd publish
6367
Compress-Archive -Path * -DestinationPath ../RSML.CLI-windows-latest-${{ matrix.arch }}.zip
6468
tar -czf ../RSML.CLI-windows-latest-${{ matrix.arch }}.tar.gz *
@@ -68,8 +72,12 @@ jobs:
6872
if: matrix.os != 'windows-latest'
6973
shell: bash
7074
run: |
71-
RID="${{ matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }}"
72-
dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r $RID --self-contained true -o publish
75+
if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
76+
RID="linux-${{ matrix.arch }}"
77+
elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
78+
RID="osx-${{ matrix.arch }}"
79+
fi
80+
dotnet publish ./src/RSML.CLI/RSML.CLI.csproj -c Release -r $RID --self-contained true -o publish
7381
cd publish
7482
zip -r ../RSML.CLI-${{ matrix.os }}-${{ matrix.arch }}.zip .
7583
tar -czf ../RSML.CLI-${{ matrix.os }}-${{ matrix.arch }}.tar.gz .
@@ -114,7 +122,7 @@ jobs:
114122
- name: Upload release artifacts
115123
uses: softprops/action-gh-release@v2
116124
with:
117-
name: RSML ${{ github.ref_name }}
125+
name: Red Sea Markup Language ${{ github.ref_name }}
118126
generate_release_notes: true
119127
files: |
120128
./release-assets/**/**/*.zip

0 commit comments

Comments
 (0)