From 06a25354a761e73d60c9db6e23bc1ac9b220d917 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Sat, 18 Apr 2026 21:39:14 +0800 Subject: [PATCH] Revert "ci: use tauri2 builders for 2.3.x pushes" This reverts commit 7e4f65b1c8d0e0c3d3fcb660b6fd588218bb72cb. --- .github/workflows/build.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1048e25..c6410c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,9 +19,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -env: - GPDEV_BUILDER_SUFFIX: ${{ github.event_name == 'push' && github.ref == 'refs/heads/2.3.x' && '-tauri2' || '' }} - jobs: # Include arm64 if ref is a tag setup-matrix: @@ -140,13 +137,13 @@ jobs: docker run --rm \ -e LIBXML2_STATIC=1 \ -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ - yuezk/gpdev:${{ matrix.package }}-builder${{ env.GPDEV_BUILDER_SUFFIX }} + yuezk/gpdev:${{ matrix.package }}-builder - name: Install ${{ matrix.package }} package in Docker run: | docker run --rm \ -e GPGUI_INSTALLED=0 \ -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ - yuezk/gpdev:${{ matrix.package }}-builder${{ env.GPDEV_BUILDER_SUFFIX }} \ + yuezk/gpdev:${{ matrix.package }}-builder \ bash install.sh - name: Upload ${{ matrix.package }} package uses: actions/upload-artifact@v4 @@ -193,12 +190,12 @@ jobs: run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin - name: Build gpgui in Docker run: | - docker run --rm -e LIBXML2_STATIC=1 -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder${{ env.GPDEV_BUILDER_SUFFIX }} + docker run --rm -e LIBXML2_STATIC=1 -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder - name: Install gpgui in Docker run: | cd gpgui-source tar -xJf *.bin.tar.xz - docker run --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder${{ env.GPDEV_BUILDER_SUFFIX }} \ + docker run --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder \ bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version" - name: Upload gpgui uses: actions/upload-artifact@v4