From 557660b16bc27179343641bdaac13c26023d789b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=8B=E6=A2=A6?= <37858783+canmengxian@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 61 +++++++++++++++ .github/workflows/dotnet-desktop.yml | 106 --------------------------- v2rayN/build.ps1 | 39 ++++++++++ 3 files changed, 100 insertions(+), 106 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/dotnet-desktop.yml create mode 100644 v2rayN/build.ps1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..fb66bdc4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,61 @@ +name: release + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + strategy: + matrix: + configuration: [Release] + + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: 删除工作流运行 + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 0 + keep_minimum_runs: 1 + + - name: Build + run: cd v2rayN && + .\build.ps1 + + # - name: Package + # shell: pwsh + # run: | + # 7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: v2rayN + path: + .\v2rayN\v2rayN.zip + + + # - name: Release + # uses: softprops/action-gh-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + # with: + # prerelease: ${{ contains(github.ref, '-') }} + # draft: false + # files: | + # .\v2rayN\v2rayN.zip + # body: | + # [![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/netch_channel) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/netch_group) + # ## Changelogs + # * This is an automated deployment of GitHub Actions, the change log should be updated manually soon + + # ## 更新日志 + # * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新 \ No newline at end of file diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml deleted file mode 100644 index 48f648ae..00000000 --- a/.github/workflows/dotnet-desktop.yml +++ /dev/null @@ -1,106 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# This workflow will build, test, sign and package a WPF or Windows Forms desktop application -# built on .NET Core. -# To learn how to migrate your existing application to .NET Core, -# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework -# -# To configure this workflow: -# -# 1. Configure environment variables -# GitHub sets default environment variables for every workflow run. -# Replace the variables relative to your project in the "env" section below. -# -# 2. Signing -# Generate a signing certificate in the Windows Application -# Packaging Project or add an existing signing certificate to the project. -# Next, use PowerShell to encode the .pfx file using Base64 encoding -# by running the following Powershell script to generate the output string: -# -# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte -# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' -# -# Open the output file, SigningCertificate_Encoded.txt, and copy the -# string inside. Then, add the string to the repo as a GitHub secret -# and name it "Base64_Encoded_Pfx." -# For more information on how to configure your signing certificate for -# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing -# -# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". -# See "Build the Windows Application Packaging project" below to see how the secret is used. -# -# For more information on GitHub Actions, refer to https://github.com/features/actions -# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, -# refer to https://github.com/microsoft/github-actions-for-desktop-apps - -name: .NET Core Desktop - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - - build: - - strategy: - matrix: - configuration: [Release] - - runs-on: windows-latest # For a list of available runner types, refer to - # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on - - env: - Solution_Name: v2rayN\v2rayN.sln - #Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. - Wap_Project_Directory: v2rayN\v2rayN\bin - #Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - # Install the .NET Core workload - - name: Install .NET Core - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.0.x - - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 - - # Restore the application to populate the obj folder with RuntimeIdentifiers - - name: Restore the application - run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - env: - Configuration: ${{ matrix.configuration }} - - - # Create the app package by building and packaging the Windows Application Packaging project - - name: Create the app package - run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration - env: - Appx_Bundle: Always - Appx_Bundle_Platforms: x86|x64 - Appx_Package_Build_Mode: StoreUpload - Configuration: ${{ matrix.configuration }} - - - name: check output - run: ls ${{ env.Wap_Project_Directory }} - env: - Configuration: ${{ matrix.configuration }} - - # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: Upload build artifacts - uses: actions/upload-artifact@v3 - with: - name: MSIX Package - path: ${{ env.Wap_Project_Directory }}\Release\net6.0-windows diff --git a/v2rayN/build.ps1 b/v2rayN/build.ps1 new file mode 100644 index 00000000..e87fa1ef --- /dev/null +++ b/v2rayN/build.ps1 @@ -0,0 +1,39 @@ +param ( + [Parameter()] + [ValidateNotNullOrEmpty()] + [string] + $OutputPath = '.\bin\v2rayN' +) + +Write-Host 'Building' + +dotnet publish ` + .\v2rayN\v2rayN.csproj ` + -c Release ` + --self-contained false ` + -p:PublishReadyToRun=true ` + -p:PublishSingleFile=true ` + -o $OutputPath + +dotnet publish ` + .\v2rayUpgrade\v2rayUpgrade.csproj ` + -c Release ` + --self-contained false ` + -p:PublishReadyToRun=true ` + -p:PublishSingleFile=true ` + -o $OutputPath + +if ( -Not $? ) { + exit $lastExitCode + } + +if ( Test-Path -Path .\bin\v2rayN ) { + rm -Force "$OutputPath\*.pdb" + rm -Force "$OutputPath\*.xml" +} + +Write-Host 'Build done' + +ls $OutputPath +7z a v2rayN.zip $OutputPath +exit 0 \ No newline at end of file