From 3923b57abfa6c024c4d2691ed5126a8ffde38044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 27 Jan 2025 10:33:16 +0800 Subject: [PATCH] release: Update NDK to r28-beta3 --- .github/workflows/build.yml | 10 +++++----- .goreleaser.yaml | 2 +- cmd/internal/build_shared/sdk.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b813a66c..000ac3e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: ~/go/go1.20.14 key: go120 - name: Setup legacy Go - if: matrix.require_legacy_go == 'true' && steps.cache-legacy-go.outputs.cache-hit != 'true' + if: matrix.require_legacy_go && steps.cache-legacy-go.outputs.cache-hit != 'true' run: |- wget https://dl.google.com/go/go1.20.14.linux-amd64.tar.gz tar -xzf go1.20.14.linux-amd64.tar.gz @@ -159,7 +159,7 @@ jobs: uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser-pro - version: latest + version: 2.5.1 install-only: true - name: Extract signing key run: |- @@ -224,7 +224,7 @@ jobs: id: setup-ndk uses: nttld/setup-ndk@v1 with: - ndk-version: r28-beta2 + ndk-version: r28-beta3 - name: Setup OpenJDK run: |- sudo apt update && sudo apt install -y openjdk-17-jdk-headless @@ -299,7 +299,7 @@ jobs: id: setup-ndk uses: nttld/setup-ndk@v1 with: - ndk-version: r28-beta2 + ndk-version: r28-beta3 - name: Setup OpenJDK run: |- sudo apt update && sudo apt install -y openjdk-17-jdk-headless @@ -548,7 +548,7 @@ jobs: uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser-pro - version: latest + version: 2.5.1 install-only: true - name: Cache ghr uses: actions/cache@v4 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 62136cfc..9eb02c94 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -52,7 +52,7 @@ builds: env: - CGO_ENABLED=0 - GOROOT={{ .Env.GOPATH }}/go1.20.14 - gobinary: "{{ .Env.GOPATH }}/go1.20.14/bin/go" + tool: "{{ .Env.GOPATH }}/go1.20.14/bin/go" targets: - windows_amd64_v1 - windows_386 diff --git a/cmd/internal/build_shared/sdk.go b/cmd/internal/build_shared/sdk.go index 5dbefa4a..eab95216 100644 --- a/cmd/internal/build_shared/sdk.go +++ b/cmd/internal/build_shared/sdk.go @@ -48,7 +48,7 @@ func FindSDK() { } func findNDK() bool { - const fixedVersion = "28.0.12674087" + const fixedVersion = "28.0.12916984" const versionFile = "source.properties" if fixedPath := filepath.Join(androidSDKPath, "ndk", fixedVersion); rw.IsFile(filepath.Join(fixedPath, versionFile)) { androidNDKPath = fixedPath