diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aad87f8..bf0ed63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,13 +47,13 @@ jobs: run: | python "自动化脚本/修改架构.py" "${{ matrix.arch }}" - - name: 发布 - Windows - Any CPU + - name: 发布 - Windows - x64/x86/arm64/amd64 if: ${{ runner.os == 'Windows' && matrix.arch != 'arm' }} run: | dotnet publish ghv/ghv.csproj --configuration Release --output ./output -r win-${{ matrix.arch }} dotnet publish ghv/ghv.csproj --configuration Release --output ./output_SingleFile -r win-${{ matrix.arch }} /p:PublishSingleFile=true /p:PublishTrimmed=true - - name: 发布 - linux - x64/arm/arm64 + - name: 发布 - linux - x64/arm/arm64/amd64 if: ${{ runner.os == 'Linux' && matrix.arch != 'x86' }} run: | dotnet publish ghv/ghv.csproj --configuration Release --output ./output -r linux-${{ matrix.arch }} @@ -68,7 +68,6 @@ jobs: # 使用7z压缩为zip格式 7z a -tzip Release/GitHubView-${{ github.event.inputs.version }}-${{ matrix.os }}-${{ matrix.arch }}.zip output/* - 7z a -tzip Release/GitHubView-${{ github.event.inputs.version }}-${{ matrix.os }}-${{ matrix.arch }}-SingleFile.zip output_SingleFile/* # 创建安装包 curl -o "C:\Program Files (x86)\Inno Setup 6\Languages\ChineseSimplified.isl" "https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl" @@ -91,7 +90,6 @@ jobs: # 使用tar压缩 tar -czvf Release/GitHubView-${{ github.event.inputs.version }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz -C output . - tar -czvf Release/GitHubView-${{ github.event.inputs.version }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz -C output_SingleFile . # ======================================================= echo "构建DEB包..." diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ce7fa3d..ea0fb49 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -54,13 +54,13 @@ jobs: run: | python "自动化脚本/修改架构.py" "${{ matrix.arch }}" - - name: 发布 - Windows - x64/x86/arm64 + - name: 发布 - Windows - x64/x86/arm64/amd64 if: ${{ runner.os == 'Windows' && matrix.arch != 'arm' }} run: | dotnet publish ghv/ghv.csproj --configuration Release --output ./output -r win-${{ matrix.arch }} dotnet publish ghv/ghv.csproj --configuration Release --output ./output_SingleFile -r win-${{ matrix.arch }} /p:PublishSingleFile=true /p:PublishTrimmed=true - - name: 发布 - linux - x64/arm/arm64 + - name: 发布 - linux - x64/arm/arm64/amd64 if: ${{ runner.os == 'Linux' && matrix.arch != 'x86' }} run: | dotnet publish ghv/ghv.csproj --configuration Release --output ./output -r linux-${{ matrix.arch }} @@ -75,7 +75,6 @@ jobs: # 使用7z压缩为zip格式 7z a -tzip Release/GitHubView-${{ env.NIGHTLY_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}.zip output/* - 7z a -tzip Release/GitHubView-${{ env.NIGHTLY_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}-SingleFile.zip output_SingleFile/* # 创建安装包 curl -o "C:\Program Files (x86)\Inno Setup 6\Languages\ChineseSimplified.isl" "https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl" @@ -98,7 +97,6 @@ jobs: # 使用tar压缩 tar -czvf Release/GitHubView-${{ env.NIGHTLY_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz -C output . - tar -czvf Release/GitHubView-${{ env.NIGHTLY_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz -C output_SingleFile . # ======================================================= echo "构建DEB包..."