diff --git a/.github/workflows/deploy-pypi.yml b/.github/workflows/deploy-pypi.yml index 47fc1eb..883d71f 100644 --- a/.github/workflows/deploy-pypi.yml +++ b/.github/workflows/deploy-pypi.yml @@ -89,7 +89,6 @@ jobs: python-version: "3.13" python-architecture: x64 pyside6-version: "6.8.3" - linux-appimage-builder: linuxdeploy windows-compatibility: "" windows-architecture: "" - id: linux-arm64 @@ -97,7 +96,6 @@ jobs: python-version: "3.11" python-architecture: arm64 pyside6-version: "6.8.3" - linux-appimage-builder: appimagetool windows-compatibility: "" windows-architecture: "" - id: windows7-amd64 @@ -182,33 +180,21 @@ jobs: flatpak install -y flathub org.kde.Platform//6.8 org.kde.Sdk//6.8 if [ "$RUNNER_ARCH" == "X64" ]; then - echo "QMAKE=$(command -v qmake6)" >> "$GITHUB_ENV" - - linuxdeploy_arch="x86_64" - linuxdeploy_tools=".linuxdeploy-bin" - mkdir "$linuxdeploy_tools" - echo "${PWD}/${linuxdeploy_tools}" >> "$GITHUB_PATH" - - wget -P "$linuxdeploy_tools" \ - "https://github.com/linuxdeploy/linuxdeploy/releases/latest/download/linuxdeploy-${linuxdeploy_arch}.AppImage" - wget -P "$linuxdeploy_tools" \ - "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/latest/download/linuxdeploy-plugin-qt-${linuxdeploy_arch}.AppImage" - wget -P "$linuxdeploy_tools" \ - "https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-${linuxdeploy_arch}.AppImage" - chmod +x "$linuxdeploy_tools"/* + appimage_arch="x86_64" elif [ "$RUNNER_ARCH" == "ARM64" ]; then appimage_arch="aarch64" - appimage_tools=".appimage-tools" - mkdir "$appimage_tools" - echo "${PWD}/${appimage_tools}" >> "$GITHUB_PATH" - - wget -P "$appimage_tools" \ - "https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-${appimage_arch}.AppImage" - chmod +x "$appimage_tools"/* else echo "Unknown runner architecture: $RUNNER_ARCH" exit 1 fi + + appimage_tools=".appimage-tools" + mkdir "$appimage_tools" + echo "${PWD}/${appimage_tools}" >> "$GITHUB_PATH" + + wget -P "$appimage_tools" \ + "https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-${appimage_arch}.AppImage" + chmod +x "$appimage_tools"/* if: runner.os == 'Linux' - name: Install Windows dependencies shell: pwsh @@ -517,7 +503,6 @@ jobs: - name: Run deploy script env: APPIMAGE_EXTRACT_AND_RUN: "1" - LINUX_APPIMAGE_BUILDER: ${{ matrix.linux-appimage-builder }} run: | if [[ -n "${{ matrix.windows-compatibility }}" ]]; then export WIN_VER_COMPATIBLE="${{ matrix.windows-compatibility }}"