소스 검색

release: Fix update android version

世界 8 달 전
부모
커밋
4000e1e66d
2개의 변경된 파일14개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 1
      .github/workflows/build.yml
  2. 6 2
      cmd/internal/update_android_version/main.go

+ 8 - 1
.github/workflows/build.yml

@@ -256,9 +256,16 @@ jobs:
         with:
           path: ~/.gradle
           key: gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Build
+      - name: Update version
+        if: github.event_name == 'workflow_dispatch'
         run: |-
           go run -v ./cmd/internal/update_android_version --ci
+      - name: Update nightly version
+        if: github.event_name != 'workflow_dispatch'
+        run: |-
+          go run -v ./cmd/internal/update_android_version --ci --nightly
+      - name: Build
+        run: |-
           mkdir clients/android/app/libs
           cp libbox.aar clients/android/app/libs
           cd clients/android

+ 6 - 2
cmd/internal/update_android_version/main.go

@@ -13,10 +13,14 @@ import (
 	"github.com/sagernet/sing/common"
 )
 
-var flagRunInCI bool
+var (
+	flagRunInCI    bool
+	flagRunNightly bool
+)
 
 func init() {
 	flag.BoolVar(&flagRunInCI, "ci", false, "Run in CI")
+	flag.BoolVar(&flagRunNightly, "nightly", false, "Run nightly")
 }
 
 func main() {
@@ -61,7 +65,7 @@ func main() {
 	if !(versionUpdated || goVersionUpdated) {
 		log.Info("version not changed")
 		return
-	} else if flagRunInCI {
+	} else if flagRunInCI && !flagRunNightly {
 		log.Fatal("version changed, commit changes first.")
 	}
 	for _, propPair := range propsList {