From 0b3c106c6f8039dca0d62ffe545c4068ee12052d Mon Sep 17 00:00:00 2001 From: 886963226 Date: Mon, 4 Nov 2024 09:32:16 +0800 Subject: [PATCH] Update build.yml (#3841) patch fix go Do not use custom versions. Usually, major versions are bundled with the latest version. Source:https://github.com/actions/toolkit/blob/main/docs/action-versioning.md --- .github/workflows/build.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 777d9fad..7638b198 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v4.5.0 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '21' @@ -26,16 +26,22 @@ jobs: - name: Setup Golang uses: actions/setup-go@v5 with: - go-version: '1.22.4' + go-version: '1.23.2' cache: false + - name: Patch Go use 600296 + #https://go-review.googlesource.com/c/go/+/600296 + run: | + cd "$(go env GOROOT)" + curl "https://go-review.googlesource.com/changes/go~600296/revisions/5/patch" | base64 -d | patch --verbose -p 1 + - name: Install gomobile run: | go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20240806205939-81131f6468ab echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - name: Setup Android environment - uses: android-actions/setup-android@v3.2.1 + uses: android-actions/setup-android@v3 - name: Build dependencies run: | @@ -56,28 +62,28 @@ jobs: ./gradlew assembleDebug - name: Upload arm64-v8a APK - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: arm64-v8a path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk - name: Upload armeabi-v7a APK - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: armeabi-v7a path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk - name: Upload x86 APK - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: x86-apk path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk - name: Upload Other APKs - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4 with: name: others-apk path: |