Skip to content

Commit 151b507

Browse files
Merge branch 'VisualPinball:master' into feature/media-controller
2 parents 32f4f6a + 6659002 commit 151b507

30 files changed

+914
-6531
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,29 @@ 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
19+
- run: |
20+
- run: |
21+
mkdir -p tmp/Runtime/GrpcInterface/Generated
22+
cp -r Plugins tmp
23+
cp -r YetAnotherHttpHandler tmp
24+
cp -r Runtime/GrpcInterface/Generated/* tmp/Runtime/GrpcInterface/Generated/
2925
- uses: actions/upload-artifact@v4
3026
with:
31-
name: NuGetDependencies-${{ matrix.rid }}
32-
path: Dependencies/NuGetDependencies/${{ matrix.rid }}
33-
install-yetanotherhttphandler:
34-
name: Install YetAnotherHttpHandler
35-
runs-on: ubuntu-latest
36-
steps:
37-
- uses: actions/checkout@v4
38-
- run: dotnet build /t:InstallYetAnotherHttpHandler
39-
- uses: actions/upload-artifact@v4
40-
with:
41-
name: YetAnotherHttpHandler
42-
path: Dependencies/YetAnotherHttpHandler
27+
name: Build-Artifacts
28+
path: tmp
4329

4430
dispatch:
4531
runs-on: ubuntu-latest
46-
needs: [ build, install-yetanotherhttphandler ]
32+
needs: [ build]
4733
if: github.repository == 'VisualPinball/VisualPinball.Engine.Mpf' && github.ref == 'refs/heads/master' && github.event_name == 'push'
4834
steps:
4935
- uses: peter-evans/repository-dispatch@v1

.github/workflows/publish.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- uses: actions/download-artifact@v4
12-
with:
13-
merge-multiple: true
14-
github-token: ${{ secrets.GITHUB_TOKEN }}
15-
run-id: ${{ github.event.client_payload.artifacts_run_id }}
1611
- uses: actions/setup-node@v4
1712
with:
1813
node-version: '20.x'
1914
registry-url: 'https://registry.visualpinball.org'
15+
- uses: actions/download-artifact@v4
16+
with:
17+
name: Build-Artifacts
18+
path: .
19+
github-token: ${{ secrets.GITHUB_TOKEN }}
20+
run-id: ${{ github.event.client_payload.artifacts_run_id }}
2021
- name: Publish
2122
run: npm publish
2223
env:
23-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
24+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fetch-depth: 0
1313
- name: Fetch next version
1414
id: nextVersion
15-
uses: VisualPinball/next-version-action@v0.1.7
15+
uses: VisualPinball/next-version-action@v0
1616
with:
1717
tagPrefix: 'v'
1818
- name: Bump
@@ -29,18 +29,17 @@ jobs:
2929
git commit -m "release: ${{ steps.nextVersion.outputs.nextTag }}."
3030
git push
3131
commitish=$(git rev-parse HEAD)
32-
echo ::set-output name=commitish::${commitish}
32+
echo "commitish=${commitish}" >> $GITHUB_OUTPUT
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3535
- name: Create Release
36-
uses: actions/create-release@v1
36+
uses: softprops/action-gh-release@v2
3737
with:
3838
tag_name: ${{ steps.nextVersion.outputs.nextTag }}
39-
release_name: ${{ steps.nextVersion.outputs.nextTag }}
39+
name: ${{ steps.nextVersion.outputs.nextTag }}
4040
prerelease: ${{ steps.nextVersion.outputs.isPrerelease }}
41-
commitish: ${{ steps.commit.outputs.commitish }}
42-
env:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
target_commitish: ${{ steps.commit.outputs.commitish }}
42+
token: ${{ secrets.GITHUB_TOKEN }}
4443

4544
dispatch:
4645
runs-on: ubuntu-latest

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,5 +357,10 @@ VisualPinball.Engine.Mpf/machine/data/
357357
# macOS meta files
358358
*.DS_Store
359359

360-
Dependencies/
361-
Dependencies.meta
360+
Plugins/*
361+
!Plugins/*.meta
362+
363+
YetAnotherHttpHandler/
364+
365+
Runtime/GrpcInterface/Generated/*
366+
!Runtime/GrpcInterface/Generated/*.meta

0 commit comments

Comments
 (0)