From c5de8a39415883e0b7c0c0a000ac1376c526efaa Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 30 May 2026 18:45:05 +0800 Subject: [PATCH 1/5] Try upload-artifact@v7 archive: false and checkout@v6 token --- .github/workflows/ci.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a74345de..ab5dcab9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: git submodule update --init --recursive libchewing - name: Setup Android NDK - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v4 with: packages: "ndk;${{ env.NDK_VERSION }} cmake;${{ env.CMAKE_VERSION }}" @@ -62,7 +62,7 @@ jobs: run: | # use archlinux's dynamic only ghc cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - ./build-cabal -j everything + ./build-cabal -j libthai - name: Pack prebuilt libraries if: github.event_name == 'pull_request' @@ -77,10 +77,10 @@ jobs: - name: Upload prebuilt to artifact if: github.event_name == 'pull_request' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: path: build/prebuilt.tar.zst - compression-level: 0 + archive: false - name: Fetch fcitx5-android/prebuilt if: github.event_name == 'push' && github.ref == 'refs/heads/master' @@ -88,11 +88,10 @@ jobs: with: path: prebuilt repository: fcitx5-android/prebuilt - fetch-depth: 0 - persist-credentials: false + token: ${{ secrets.BOT_TOKEN }} - name: Push to fcitx5-android/prebuilt - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' working-directory: prebuilt run: | rm -r ./* @@ -100,9 +99,8 @@ jobs: do cp -a "../build/$TARGET" ./ done - git remote set-url origin "https://${{ secrets.BOT_TOKEN }}@github.com/fcitx5-android/prebuilt.git" git config user.name "Fcitx5 Android Bot" git config user.email "102923727+fcitx5-android-bot@users.noreply.github.com" git add . git diff-index --quiet HEAD || git commit -m "Auto update" - git push --set-upstream origin "HEAD:master" --follow-tags --atomic + git push --set-upstream origin "HEAD:ci-test" --follow-tags --atomic From 7d6fe8113b9bbb0f4b69f9e1212f329a850daffa Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 30 May 2026 18:49:11 +0800 Subject: [PATCH 2/5] f --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab5dcab9..baf6dd68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: archive: false - name: Fetch fcitx5-android/prebuilt - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' uses: actions/checkout@v6 with: path: prebuilt From f236c836ac21a36a35807b13b46de86e168e56b7 Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 30 May 2026 18:56:51 +0800 Subject: [PATCH 3/5] try new token --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baf6dd68..988c39c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: with: path: prebuilt repository: fcitx5-android/prebuilt - token: ${{ secrets.BOT_TOKEN }} + token: ${{ secrets.PREBUILT_PUSH_TOKEN }} - name: Push to fcitx5-android/prebuilt # if: github.event_name == 'push' && github.ref == 'refs/heads/master' From 2b9ea879579f335824f174b2117a32b4ff4e9576 Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 30 May 2026 18:59:43 +0800 Subject: [PATCH 4/5] full test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 988c39c6..ffff9c64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: run: | # use archlinux's dynamic only ghc cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - ./build-cabal -j libthai + ./build-cabal -j everything - name: Pack prebuilt libraries if: github.event_name == 'pull_request' From 799891888aa4af0dfddc047ceb5c4d3c8414508f Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 30 May 2026 19:43:01 +0800 Subject: [PATCH 5/5] finalize --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffff9c64..61cf56ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: archive: false - name: Fetch fcitx5-android/prebuilt - # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/master' uses: actions/checkout@v6 with: path: prebuilt @@ -91,7 +91,7 @@ jobs: token: ${{ secrets.PREBUILT_PUSH_TOKEN }} - name: Push to fcitx5-android/prebuilt - # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/master' working-directory: prebuilt run: | rm -r ./* @@ -103,4 +103,4 @@ jobs: git config user.email "102923727+fcitx5-android-bot@users.noreply.github.com" git add . git diff-index --quiet HEAD || git commit -m "Auto update" - git push --set-upstream origin "HEAD:ci-test" --follow-tags --atomic + git push --set-upstream origin "HEAD:master" --follow-tags --atomic