Skip to content

Commit 6334d78

Browse files
arthurkehrwaldfreezy
authored andcommitted
Simplify build process to single platform
1 parent c64efde commit 6334d78

File tree

3 files changed

+9
-39
lines changed

3 files changed

+9
-39
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,28 @@ defaults:
77

88
jobs:
99
build:
10-
name: Build ${{ matrix.rid }}
11-
runs-on: ${{ matrix.os }}
10+
name: Build
11+
runs-on: ubuntu-latest
1212
strategy:
1313
fail-fast: false
14-
matrix:
15-
include:
16-
- os: windows-latest
17-
rid: win-x64
18-
- os: windows-latest
19-
rid: win-x86
20-
- os: macos-latest
21-
rid: osx-x64
22-
- os: ubuntu-latest
23-
rid: linux-x64
2414
steps:
2515
- uses: actions/checkout@v4
2616
- name: Build
2717
run: |
28-
dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false
18+
dotnet build -c Release
2919
- run: |
3020
mkdir -p tmp/Plugins
31-
cp -r Plugins/${{ matrix.rid }} tmp/Plugins
21+
cp -r Plugins tmp/Plugins
22+
mkdir -p tmp/YetAnotherHttpHandler
23+
cp -r YetAnotherHttpHandler tmp/YetAnotherHttpHandler
3224
- uses: actions/upload-artifact@v4
3325
with:
34-
name: Plugins-${{ matrix.rid }}
26+
name: Plugins
3527
path: tmp
36-
install-yetanotherhttphandler:
37-
name: Install YetAnotherHttpHandler
38-
runs-on: ubuntu-latest
39-
steps:
40-
- uses: actions/checkout@v4
41-
- run: dotnet build /t:InstallYetAnotherHttpHandler
42-
- run: |
43-
mkdir -p tmp/YetAnotherHttpHandler
44-
cp -r YetAnotherHttpHandler tmp/YetAnotherHttpHandler
45-
- uses: actions/upload-artifact@v4
46-
with:
47-
name: YetAnotherHttpHandler
48-
path: tmp
4928

5029
dispatch:
5130
runs-on: ubuntu-latest
52-
needs: [ build, install-yetanotherhttphandler ]
31+
needs: [ build]
5332
if: github.repository == 'VisualPinball/VisualPinball.Engine.Mpf' && github.ref == 'refs/heads/master' && github.event_name == 'push'
5433
steps:
5534
- uses: peter-evans/repository-dispatch@v1

.github/workflows/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/download-artifact@v4
1212
with:
13-
merge-multiple: true
1413
github-token: ${{ secrets.GITHUB_TOKEN }}
1514
run-id: ${{ github.event.client_payload.artifacts_run_id }}
1615
- uses: actions/setup-node@v4

VisualPinball.Engine.Mpf.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
<Compile Remove="**/*.cs" />
1919
</ItemGroup>
2020

21-
<!-- Specify runtime identifier-->
22-
<PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
23-
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' != 'x86'">win-x64</RuntimeIdentifier>
24-
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' == 'x86'">win-x86</RuntimeIdentifier>
25-
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</RuntimeIdentifier>
26-
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
27-
</PropertyGroup>
28-
2921
<PropertyGroup>
3022
<InstallYetAnotherHttpHandler Condition="'$(InstallYetAnotherHttpHandler)' == ''">true</InstallYetAnotherHttpHandler>
3123
</PropertyGroup>
@@ -57,7 +49,7 @@
5749
<ItemGroup>
5850
<OutputFiles Include="$(OutDir)/*.*"/>
5951
</ItemGroup>
60-
<Copy SourceFiles="@(OutputFiles)" DestinationFolder="./Plugins/$(RuntimeIdentifier)" SkipUnchangedFiles="true"/>
52+
<Copy SourceFiles="@(OutputFiles)" DestinationFolder="./Plugins" SkipUnchangedFiles="true"/>
6153
</Target>
6254

6355
<!-- Delete build artifacts-->

0 commit comments

Comments
 (0)