diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ce25e8..c31bffe9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,22 +27,14 @@ jobs: run: | .\build.ps1 New-Item -ItemType Directory -Path C:\builtfiles -Force > $null - Compress-Archive -Path Netch\bin\x64\Release\win-x64\* -DestinationPath C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip - echo "::set-env name=Netch64_SHA256::$(.\getSHA256.ps1 C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip)" - Compress-Archive -Path Netch\bin\x86\Release\win-x86\* -DestinationPath C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip - echo "::set-env name=Netch86_SHA256::$(.\getSHA256.ps1 C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip)" + Compress-Archive -Path Netch\bin\x64\Release\win-x64\* -DestinationPath C:\builtfiles\Netch-${{ env.GITHUB_TAG_NAME }}.zip + echo "::set-env name=Netch_SHA256::$(.\getSHA256.ps1 C:\builtfiles\Netch-${{ env.GITHUB_TAG_NAME }}.zip)" - - name: Upload Netch.x64 + - name: Upload Netch uses: actions/upload-artifact@v1 with: - name: Netch.x64 + name: Netch path: Netch\bin\x64\Release\win-x64 - - - name: Upload Netch.x86 - uses: actions/upload-artifact@v1 - with: - name: Netch.x86 - path: Netch\bin\x86\Release\win-x86 # Create a new release: create a tag, then 'git push origin ', wait for it to build - name: Create a new GitHub release if a new tag is pushed @@ -52,8 +44,7 @@ jobs: prerelease: true draft: false files: | - C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip - C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip + C:\builtfiles\Netch-${{ env.GITHUB_TAG_NAME }}.zip body: | [![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/Netch) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/Netch_Discuss_Group) @@ -64,8 +55,7 @@ jobs: ## 文件校验 | 文件名 | SHA256 | | :- | :- | - | Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip | ${{ env.Netch64_SHA256 }} | - | Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip | ${{ env.Netch86_SHA256 }} | + | Netch-${{ env.GITHUB_TAG_NAME }}.zip | ${{ env.Netch_SHA256 }} | if: startsWith(github.ref, 'refs/tags/') env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/binaries b/binaries index 52ba0a29..513e9823 160000 --- a/binaries +++ b/binaries @@ -1 +1 @@ -Subproject commit 52ba0a29eafc603cd9708af43efb40410138dfdc +Subproject commit 513e9823a8a4f5ef7cdeecf2dcbfa2707a0bc3b1 diff --git a/build.ps1 b/build.ps1 index 3549ab13..b1689cb8 100644 --- a/build.ps1 +++ b/build.ps1 @@ -22,52 +22,18 @@ function Build-NetFrameworkx64 Write-Host 'Build x64 Complete ,Started Copy bin,mode,i18n file' -mkdir "$net_baseoutput\x64\Release\win-x64\bin" -Copy-Item "$mainDir\binaries\x64\*" -destination "$net_baseoutput\x64\Release\win-x64\bin" -recurse -mkdir "$net_baseoutput\x64\Release\win-x64\bin\tap-driver" -Copy-Item "$mainDir\binaries\tap-driver\*" -destination "$net_baseoutput\x64\Release\win-x64\bin\tap-driver" -recurse -Copy-Item "$mainDir\binaries\*.acl" "$net_baseoutput\x64\Release\win-x64\bin" -Copy-Item "$mainDir\binaries\*.conf" "$net_baseoutput\x64\Release\win-x64\bin" -Copy-Item "$mainDir\binaries\*.dat" "$net_baseoutput\x64\Release\win-x64\bin" -Copy-Item "$mainDir\binaries\*.exe" "$net_baseoutput\x64\Release\win-x64\bin" -Move-Item "$net_baseoutput\x64\Release\win-x64\bin\nfapinet.dll" "$net_baseoutput\x64\Release\win-x64\nfapinet.dll" +Copy-Item "$mainDir\binaries" -destination "$net_baseoutput\x64\Release\win-x64\bin" -recurse + Copy-Item "$mainDir\translations\i18n" "$net_baseoutput\x64\Release\win-x64\i18n" -recurse -mkdir "$net_baseoutput\x64\Release\win-x64\mode" -Copy-Item "$mainDir\modes\mode\*.txt" "$net_baseoutput\x64\Release\win-x64\mode" - Write-Host 'x64 ALL DONE' +Copy-Item "$mainDir\modes\mode" "$net_baseoutput\x64\Release\win-x64\mode" -recurse -} -function Build-NetFrameworkx86 -{ - Write-Host 'Building .NET Framework x86' - - $outdir = "$net_baseoutput\x86" - - msbuild -v:m -m -t:Build /p:Configuration="Release" /p:Platform="x86" /p:TargetFramework=net48 /p:Runtimeidentifier=win-x86 /restore - if ($LASTEXITCODE) { cd $mainDir ; exit $LASTEXITCODE } + Write-Host 'Netch Build ALL DONE' - Write-Host 'Build x86 Complete ,Started Copy bin,mode,i18n file' - -mkdir "$net_baseoutput\x86\Release\win-x86\bin" -Copy-Item "$mainDir\binaries\x86\*" "$net_baseoutput\x86\Release\win-x86\bin" -mkdir "$net_baseoutput\x86\Release\win-x86\bin\tap-driver" -Copy-Item "$mainDir\binaries\tap-driver\*" "$net_baseoutput\x86\Release\win-x86\bin\tap-driver" -recurse -Copy-Item "$mainDir\binaries\*.acl" "$net_baseoutput\x86\Release\win-x86\bin" -Copy-Item "$mainDir\binaries\*.conf" "$net_baseoutput\x86\Release\win-x86\bin" -Copy-Item "$mainDir\binaries\*.dat" "$net_baseoutput\x86\Release\win-x86\bin" -Copy-Item "$mainDir\binaries\*.exe" "$net_baseoutput\x86\Release\win-x86\bin" -Move-Item "$net_baseoutput\x86\Release\win-x86\bin\nfapinet.dll" "$net_baseoutput\x86\Release\win-x86\nfapinet.dll" -Copy-Item "$mainDir\translations\i18n" "$net_baseoutput\x86\Release\win-x86\i18n" -recurse -mkdir "$net_baseoutput\x86\Release\win-x86\mode" -Copy-Item "$mainDir\modes\mode\*.txt" "$net_baseoutput\x86\Release\win-x86\mode" - - Write-Host 'x86 ALL DONE' } cd $mainDir\Netch Build-NetFrameworkx64 -Build-NetFrameworkx86 cd $mainDir