update release workflow

luigi311 · May 31, 2023 · 2dc8019 · 2dc8019
1 parent 52460e3
commit 2dc8019
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,7 +92,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: install
-          args: tauri-cli --version ^1.0.0-rc --locked
+          args: tauri-cli --version ^1.3.1 --locked
       - name: Install deps
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: sudo apt update && sudo apt upgrade -y && sudo apt install -y libssl-dev libarchive-dev build-essential cmake llvm clang libicu-dev nettle-dev libacl1-dev liblzma-dev libzstd-dev liblz4-dev libbz2-dev zlib1g-dev libxml2-dev lsb-release wget software-properties-common libwebkit2gtk-4.0-dev curl libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev libpango1.0-dev
@@ -155,7 +155,6 @@ jobs:
         run: |
           mkdir ${{ github.workspace }}/builds
           cp target/release/bundle/**/*.deb target/release/bundle/**/*.AppImage builds/
-          rm builds/linuxdeploy-x86_64.AppImage
       - name: Copy build
         if: ${{ matrix.os != 'ubuntu-latest' }}
         run: |
@@ -203,17 +202,12 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: KyleMayes/install-llvm-action@v1
         with:
-          version: "11.0"
+          version: "13.0"
       - name: Install LLVM and Clang
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
-          Invoke-WebRequest -Uri https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/LLVM-11.0.1-win64.exe -OutFile LLVM-11.0.1-win64.exe
-          7z x .\LLVM-11.0.1-win64.exe -aoa -o'C:\Program Files\LLVM'
-      - name: Download LLVM
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          Invoke-WebRequest -Uri https://github.com/faldez/tanoshi-builder/releases/download/v0.1.0/LLVM.7z -OutFile LLVM.7z
-          7z x .\LLVM.7z -o'C:\'
+          Invoke-WebRequest -Uri https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/LLVM-13.0.0-win64.exe -OutFile LLVM-13.0.0-win64.exe
+          7z x .\LLVM-13.0.0-win64.exe -aoa -o'C:\Program Files\LLVM'
       - name: Cache vcpkg
         uses: actions/cache@v2
         if: ${{ matrix.os == 'windows-latest' }}
@@ -241,7 +235,6 @@ jobs:
           args: -p tanoshi --release
         env:
           RUSTFLAGS: "-Clink-arg=-Wl,--allow-multiple-definition"
-          LLVM_SYS_110_PREFIX: ${{ env.LLVM_PATH }}
       - name: Build tanoshi
         if: ${{ matrix.os == 'macos-latest' }}
         uses: actions-rs/cargo@v1
@@ -250,15 +243,13 @@ jobs:
           args: -p tanoshi --release
         env:
           PKG_CONFIG_PATH: /usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
-          LLVM_SYS_110_PREFIX: /usr/local/opt/llvm
       - name: Build tanoshi
         if: ${{ matrix.os == 'windows-latest' }}
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: -p tanoshi --release
         env:
-          LLVM_SYS_110_PREFIX: C:\LLVM
           LIBCLANG_PATH: C:\Program Files\LLVM\bin
       - name: Copy build
         run: cp ${{ github.workspace }}/target/release/${{ matrix.filename }} ${{ github.workspace }}/target/release/${{ matrix.asset }}