diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8077ea59a0..0b160816cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: build_type: description: Type of build (Debug, Release, RelWithDebInfo, MinSizeRel) type: string - default: Debug + default: Release is_qt_cached: description: Enable Qt caching or not type: string @@ -37,21 +37,21 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - qt_ver: 5 - - - os: ubuntu-20.04 - qt_ver: 6 - qt_host: linux - qt_arch: "" - qt_version: "6.2.4" - qt_modules: "qt5compat qtimageformats" - qt_tools: "" - - - os: windows-2022 - name: "Windows-MinGW-w64" - msystem: clang64 - vcvars_arch: "amd64_x86" + # - os: ubuntu-20.04 + # qt_ver: 5 + + # - os: ubuntu-20.04 + # qt_ver: 6 + # qt_host: linux + # qt_arch: "" + # qt_version: "6.2.4" + # qt_modules: "qt5compat qtimageformats" + # qt_tools: "" + + # - os: windows-2022 + # name: "Windows-MinGW-w64" + # msystem: clang64 + # vcvars_arch: "amd64_x86" - os: windows-2022 name: "Windows-MSVC" @@ -65,36 +65,36 @@ jobs: qt_modules: 'qt5compat qtimageformats' qt_tools: '' - - os: windows-2022 - name: "Windows-MSVC-arm64" - msystem: "" - architecture: "arm64" - vcvars_arch: "amd64_arm64" - qt_ver: 6 - qt_host: windows - qt_arch: 'win64_msvc2019_arm64' - qt_version: '6.6.0' - qt_modules: 'qt5compat qtimageformats' - qt_tools: '' - - - os: macos-12 - name: macOS - macosx_deployment_target: 11.0 - qt_ver: 6 - qt_host: mac - qt_arch: '' - qt_version: '6.6.0' - qt_modules: 'qt5compat qtimageformats' - qt_tools: '' - - - os: macos-12 - name: macOS-Legacy - macosx_deployment_target: 10.13 - qt_ver: 5 - qt_host: mac - qt_version: "5.15.2" - qt_modules: "" - qt_tools: "" + # - os: windows-2022 + # name: "Windows-MSVC-arm64" + # msystem: "" + # architecture: "arm64" + # vcvars_arch: "amd64_arm64" + # qt_ver: 6 + # qt_host: windows + # qt_arch: 'win64_msvc2019_arm64' + # qt_version: '6.6.0' + # qt_modules: 'qt5compat qtimageformats' + # qt_tools: '' + + # - os: macos-12 + # name: macOS + # macosx_deployment_target: 11.0 + # qt_ver: 6 + # qt_host: mac + # qt_arch: '' + # qt_version: '6.6.0' + # qt_modules: 'qt5compat qtimageformats' + # qt_tools: '' + + # - os: macos-12 + # name: macOS-Legacy + # macosx_deployment_target: 10.13 + # qt_ver: 5 + # qt_host: mac + # qt_version: "5.15.2" + # qt_modules: "" + # qt_tools: "" runs-on: ${{ matrix.os }} @@ -591,20 +591,20 @@ jobs: run: | ccache -s - flatpak: - runs-on: ubuntu-latest - container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08 - options: --privileged - steps: - - name: Checkout - uses: actions/checkout@v4 - if: inputs.build_type == 'Debug' - with: - submodules: "true" - - name: Build Flatpak (Linux) - if: inputs.build_type == 'Debug' - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - with: - bundle: "Prism Launcher.flatpak" - manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml +# flatpak: +# runs-on: ubuntu-latest +# container: +# image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08 +# options: --privileged +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# if: inputs.build_type == 'Debug' +# with: +# submodules: "true" +# - name: Build Flatpak (Linux) +# if: inputs.build_type == 'Debug' +# uses: flatpak/flatpak-github-actions/flatpak-builder@v6 +# with: +# bundle: "Prism Launcher.flatpak" +# manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml diff --git a/.github/workflows/trigger_builds.yml b/.github/workflows/trigger_builds.yml index 70fda60ed4..62bcc78cbf 100644 --- a/.github/workflows/trigger_builds.yml +++ b/.github/workflows/trigger_builds.yml @@ -20,13 +20,28 @@ on: - ".github/ISSUE_TEMPLATE/**" - ".markdownlint**" workflow_dispatch: - + inputs: + build_type: + description: 'Build type' + required: true + default: ${{ env.default_build_type }} + type: choice + options: + - Debug + - Release + - RelWithDebInfo + - MinSizeRel +env: + default_build_type: Release + jobs: build_debug: + env: + default_build_type: ${{ env.default_build_type }} name: Build Debug uses: ./.github/workflows/build.yml with: - build_type: Debug + build_type: ${{ inputs.build_type || env.default_build_type }} is_qt_cached: true secrets: SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}