From 956377d87f90c781a26c207a3cc1cb0bda8e80ad Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Tue, 7 Dec 2021 00:18:09 +0800 Subject: [PATCH] Revert "CI: new debian build workflow compatible with missing release (#1452)" This reverts commit 949253577fb031c97693b9a9d8e4c2f2a09dd38e. --- .github/workflows/deb.yml | 42 ++++++++++----------------------------- release/debian/changelog | 4 ++-- 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 28843e7ca..2267a3187 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -2,14 +2,20 @@ name: Build debian packages on: workflow_dispatch: - inputs: - tag: - description: "The tag version you want to build. Leave it empty to use the latest one." + push: + branches: + - master + - v* + paths: + - ".github/workflows/deb.yml" + - "release/debian/*" pull_request: types: [opened, synchronize, reopened] paths: - ".github/workflows/deb.yml" - "release/debian/*" + release: + types: [prereleased] jobs: package: @@ -23,34 +29,8 @@ jobs: apt-get update apt-get install -y git wget - - name: Get tag - if: ${{ github.event_name == 'workflow_dispatch' }} - id: tag - run: | - latest_tag=$(curl -sSL --retry 5 "https://api.github.com/repos/v2fly/v2ray-core/releases/latest" | jq .tag_name | awk -F '"' '{print $2}') - if [[ -z "${{ github.event.inputs.tag }}" ]]; then - echo "Use the latest release tag of v2ray-core: ${latest_tag}" - echo ::set-output name=tag::${latest_tag} - else - echo "Use tag: ${{ github.event.inputs.tag }}" - echo ::set-output name=tag::${{ github.event.inputs.tag }} - fi - - - name: Checkout codebase on a specific tag for `workflow_dispatch` event - if: ${{ github.event_name == 'workflow_dispatch' }} + - name: Checkout codebase uses: actions/checkout@v2 - with: - ref: ${{ steps.tag.outputs.tag }} - fetch-depth: 0 - - - name: Checkout codebase on the triggered commit for other events - if: ${{ github.event_name != 'workflow_dispatch' }} - uses: actions/checkout@v2 - - - name: Override file `release/debian/changelog` to get the latest CHANGELOG - if: ${{ github.event_name == 'workflow_dispatch' }} - run: | - curl --fail "https://raw.githubusercontent.com/v2fly/v2ray-core/${github.ref_name}/release/debian/changelog" > release/debian/changelog - name: Download geo files run: | @@ -79,7 +59,7 @@ jobs: path: ./*.deb - name: Setup Repository - if: ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ github.event_name == 'release' || github.event_name == 'workflow_dispatch' }} run: | git clone https://github.com/v2fly/debian.git archive echo ${{ secrets.DEBIAN_GPG_PRIVATE }} | base64 -d > private.key diff --git a/release/debian/changelog b/release/debian/changelog index bd7fa1c88..a1db4d8d8 100644 --- a/release/debian/changelog +++ b/release/debian/changelog @@ -1,10 +1,10 @@ -v2ray-core (4.44.0-2) unstable; urgency=medium +v2ray-core (4.44.0-1) unstable; urgency=medium * Fix DoS attack vulnerability in CommandSwitchAccountFactory * Fix: apply timeout to DNS outbound * More details in https://github.com/v2fly/v2ray-core/releases/tag/v4.44.0 - -- V2Fly Mon, 6 Dec 2021 22:30:00 +0800 + -- V2Fly Mon, 6 Dec 2021 21:30:00 +0800 v2ray-core (4.42.2-2) unstable; urgency=medium