From 90e01f6d75f86a6bfe979f129c2c6dac72c28a96 Mon Sep 17 00:00:00 2001 From: cxfksword Date: Tue, 11 Oct 2022 15:47:32 +0800 Subject: [PATCH] Fix github action build --- .github/workflows/publish.yaml | 21 ++++++++++----------- build_plugin.py | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d5bfcaf..16f53c8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -4,15 +4,14 @@ on: push: tags: ["*"] +env: + dotnet-version: 6.0.x + python-version: 3.8 + project: Jellyfin.Plugin.Danmu/Jellyfin.Plugin.Danmu.csproj + branch: main + jobs: build: - strategy: - matrix: - dotnet-version: 6.0.x - python-version: 3.8 - project: Jellyfin.Plugin.Danmu/Jellyfin.Plugin.Danmu.csproj - branch: main - runs-on: ubuntu-latest name: Build & Release @@ -21,13 +20,13 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: ${{ env.dotnet-version }} - name: Restore nuget packages - run: dotnet restore ${{ matrix.project }} + run: dotnet restore ${{ env.project }} - name: Setup python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: ${{ env.python-version }} - name: Install JPRM run: python -m pip install jprm - name: Run JPRM @@ -42,6 +41,6 @@ jobs: - name: Update manifest uses: stefanzweifel/git-auto-commit-action@v4 with: - branch: ${{ matrix.branch }} + branch: ${{ env.branch }} commit_message: Update repo manifest file_pattern: manifest.json diff --git a/build_plugin.py b/build_plugin.py index 26e947b..10356d2 100644 --- a/build_plugin.py +++ b/build_plugin.py @@ -15,6 +15,7 @@ os.mkdir(artifact_dir) git_version = version +# .NET dll need major.minor[.build[.revision]] version format if version.startswith('v'): version = version.lstrip("v") version_list = version.split('.')