diff options
| author |   苏向夜 <46275354+fu050409@users.noreply.github.com> | 2026-02-24 00:04:44 +0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2026-02-24 00:04:44 +0800 |
| commit | c698d265b9a079e787ae68a92348998bad50d459 (patch) | |
| tree | ee907eca5ccbda82fc5f55e29e77e0186ec55981 | |
| parent | 28f2ea9f0a7ef21ac867a600dba634cd2a0ba140 (diff) | |
| parent | 46ad16a5b8a971259ddf0b92cee42bb77a2beca6 (diff) | |
| download | DropOut-c698d265b9a079e787ae68a92348998bad50d459.tar.gz DropOut-c698d265b9a079e787ae68a92348998bad50d459.zip | |
Merge branch 'main' into refactor/migrate-to-react
| -rw-r--r-- | .github/workflows/prek.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/semifold-ci.yaml | 18 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/.github/workflows/prek.yml b/.github/workflows/prek.yml index 5362472..3785c62 100644 --- a/.github/workflows/prek.yml +++ b/.github/workflows/prek.yml @@ -8,6 +8,10 @@ on: permissions: contents: write +env: + CARGO_TERM_COLOR: always + CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} + jobs: prek: runs-on: ubuntu-latest diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 8aecd90..27de130 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -6,6 +6,7 @@ on: env: CARGO_TERM_COLOR: always CLICOLOR_FORCE: 1 + CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} permissions: id-token: write @@ -24,14 +25,8 @@ jobs: name: "Linux x86_64 (GNU)" target: "x86_64-unknown-linux-gnu" args: "--target x86_64-unknown-linux-gnu" - # - platform: "ubuntu-latest" - # name: "Linux x86_64 (Musl)" - # target: "x86_64-unknown-linux-musl" - # args: "--target x86_64-unknown-linux-musl" - # install-musl: true - # pkg-config-allow-cross: true - platform: "ubuntu-24.04-arm" - name: "Linux arm64" + name: "Linux arm64 (GNU)" target: "aarch64-unknown-linux-gnu" args: "--target aarch64-unknown-linux-gnu" # macOS @@ -48,13 +43,8 @@ jobs: name: "Windows x86_64 (MSVC)" target: "x86_64-pc-windows-msvc" args: "--target x86_64-pc-windows-msvc --bundles nsis" - - platform: "windows-latest" - name: "Windows x86_64 (GNU)" - target: "x86_64-pc-windows-gnu" - args: "--target x86_64-pc-windows-gnu --bundles nsis" - rustflags: "-C link-arg=-lws2_32" - platform: "windows-11-arm" - name: "Windows arm64" + name: "Windows arm64 (MSVC)" target: "aarch64-pc-windows-msvc" args: "--target aarch64-pc-windows-msvc --bundles nsis" @@ -112,9 +102,7 @@ jobs: uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RUSTFLAGS: ${{ matrix.rustflags || '' }} CARGO_BUILD_TARGET: ${{ matrix.target }} - PKG_CONFIG_ALLOW_CROSS: ${{ matrix.pkg-config-allow-cross && '1' || '' }} with: args: ${{ matrix.args }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b58d10e..c292997 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,7 @@ permissions: env: CARGO_TERM_COLOR: always + CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} jobs: test: |