CI: Merge release into build.

heiher · May 19, 2024 · 0cd0e75 · 0cd0e75
1 parent c110aff
commit 0cd0e75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/release.yaml → .github/workflows/build.yaml b/.github/workflows/release.yaml → .github/workflows/build.yaml
@@ -1,6 +1,10 @@
-name: Release
+name: "Build"
 
 on:
+  push:
+    branches:
+      - '**'
+  pull_request:
   release:
     types:
       - published
@@ -11,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true
@@ -29,6 +33,7 @@ jobs:
           ./gradlew assembleRelease
           cp app/build/outputs/apk/release/hev.sockstun-*-release.apk hev.sockstun-release.apk
       - name: Upload
+        if: github.event_name == 'release'
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # SocksTun
 
+[![status](https://github.com/heiher/sockstun/actions/workflows/build.yaml/badge.svg?branch=master&event=push)](https://github.com/heiher/sockstun)
+
 A simple and lightweight VPN over socks5 proxy for Android. It is based on a high-performance and low-overhead [tun2socks](https://github.com/heiher/hev-socks5-tunnel).
 
 ## Features