From eb34a73270b663d8f7d5ced4d7c5d9abd663baba Mon Sep 17 00:00:00 2001 From: juewuy Date: Sat, 23 Mar 2024 16:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E7=BC=96?= =?UTF-8?q?=E8=AF=91singboxp=E5=86=85=E6=A0=B8=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/core_auto_update.yml | 5 ++-- .github/workflows/update_singbox_core.yaml | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/core_auto_update.yml b/.github/workflows/core_auto_update.yml index 72cd13a..3b09b8b 100644 --- a/.github/workflows/core_auto_update.yml +++ b/.github/workflows/core_auto_update.yml @@ -2,11 +2,11 @@ name: core_auto_update on: schedule: - - cron: 0 18 * * * + - cron: 0 18 * * 6 workflow_dispatch: jobs: - update_singboxp: + auto_update_singboxp_with_wg: permissions: id-token: write # need this for OIDC contents: read @@ -17,4 +17,3 @@ jobs: tag3: singbox_core_PuerNya tag5: with_quic,with_dhcp,with_wireguard,with_shadowsocksr,with_ech,with_utls,with_clash_api,with_gvisor secrets: inherit - \ No newline at end of file diff --git a/.github/workflows/update_singbox_core.yaml b/.github/workflows/update_singbox_core.yaml index ce3e4f7..1e759ca 100644 --- a/.github/workflows/update_singbox_core.yaml +++ b/.github/workflows/update_singbox_core.yaml @@ -56,16 +56,16 @@ jobs: runs-on: ubuntu-latest needs: go env: - REPO: ${{ github.event.inputs.tag1 }} - TAGS: ${{ github.event.inputs.tag5 }} + REPO: ${{ inputs.tag1 }} + TAGS: ${{ inputs.tag5 }} outputs: version: ${{steps.sing-box.outputs.version}} tags: ${{steps.sing-box.outputs.tags}} steps: - uses: actions/checkout@v4.1.1 with: - repository: ${{ github.event.inputs.tag1 }} - ref: ${{ github.event.inputs.tag2 }} + repository: ${{ inputs.tag1 }} + ref: ${{ inputs.tag2 }} fetch-depth: 0 - name: setup go @@ -79,7 +79,7 @@ jobs: git remote add sekai https://github.com/SagerNet/sing-box.git git fetch --tags sekai version=$(CGO_ENABLED=0 go run ./cmd/internal/read_tag) - [ -z "$version" ] && version=${{ github.event.inputs.tag2 }} + [ -z "$version" ] && version=${{ inputs.tag2 }} echo version=$version >> $GITHUB_OUTPUT if [ -z "$TAGS" ];then if [ "$REPO" = 'PuerNya/sing-box' ];then @@ -138,15 +138,15 @@ jobs: GOARM: ${{ matrix.goarm }} GOMIPS: ${{ matrix.gomips }} CGO_ENABLED: 0 - REPO: ${{ github.event.inputs.tag1 }} + REPO: ${{ inputs.tag1 }} TAGS: ${{needs.sing-box.outputs.tags}} VERSION: ${{needs.sing-box.outputs.version}} steps: - name: Checkout sing-box uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: - repository: ${{ github.event.inputs.tag1 }} - ref: ${{ github.event.inputs.tag2 }} + repository: ${{ inputs.tag1 }} + ref: ${{ inputs.tag2 }} fetch-depth: 1 - name: Setup Go @@ -182,8 +182,8 @@ jobs: - sing-box runs-on: ubuntu-latest env: - RELEASE: ${{ github.event.inputs.tag3 }} - PUSHDIR: ${{ github.event.inputs.tag4 }} + RELEASE: ${{ inputs.tag3 }} + PUSHDIR: ${{ inputs.tag4 }} VERSION: ${{needs.sing-box.outputs.version}} steps: - name: Checkout ShellCrash @@ -210,8 +210,8 @@ jobs: - name: Commit and push if: ${{ env.PUSHDIR != '' }} run: | - [ "${{ github.event.inputs.tag1 }}" = SagerNet/sing-box ] && crashcore='singbox' - [ "${{ github.event.inputs.tag1 }}" = PuerNya/sing-box ] && crashcore='singboxp' + [ "${{ inputs.tag1 }}" = SagerNet/sing-box ] && crashcore='singbox' + [ "${{ inputs.tag1 }}" = PuerNya/sing-box ] && crashcore='singboxp' mkdir -p ./bin/${crashcore} rm -fr ./bin/${crashcore}/* mv -f ./tmp/singbox-linux-*.tar.gz ./bin/${crashcore}/ @@ -225,9 +225,9 @@ jobs: if: ${{ env.RELEASE != '' && env.PUSHDIR == '' }} uses: softprops/action-gh-release@v1 with: - tag_name: ${{ github.event.inputs.tag3 }} - name: ${{ github.event.inputs.tag3 }} - body: "The ${{env.VERSION}} version of ${{ github.event.inputs.tag1 }} \n这是${{ github.event.inputs.tag1 }}的${{env.VERSION}}版本内核文件\nhttps://github.com/${{ github.event.inputs.tag1 }}/releases \nOnly support for ShellCrash\n仅适配ShellCrash项目" + tag_name: ${{ inputs.tag3 }} + name: ${{ inputs.tag3 }} + body: "The ${{env.VERSION}} version of ${{ inputs.tag1 }} \n这是${{ inputs.tag1 }}的${{env.VERSION}}版本内核文件\nhttps://github.com/${{ inputs.tag1 }}/releases \nOnly support for ShellCrash\n仅适配ShellCrash项目" draft: false prerelease: true files: |