From 67cce525937446197cd300049e9c386359a82aba Mon Sep 17 00:00:00 2001 From: Jonatan Czarniecki Date: Mon, 20 Nov 2023 20:56:58 +0100 Subject: [PATCH] customize workflows --- .github/workflows/build.yml | 111 ++++++++++++++------------- .github/workflows/trigger_builds.yml | 13 +++- 2 files changed, 67 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b530dad94..5ca611bd99 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 @@ -52,12 +52,12 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - qt_ver: 5 - qt_host: linux - qt_arch: "" - qt_version: "5.12.8" - qt_modules: "qtnetworkauth" + # - os: ubuntu-20.04 + # qt_ver: 5 + # qt_host: linux + # qt_arch: "" + # qt_version: "5.12.8" + # qt_modules: "qtnetworkauth" - os: ubuntu-20.04 qt_ver: 6 @@ -66,10 +66,10 @@ jobs: qt_version: "6.2.4" qt_modules: "qt5compat qtimageformats qtnetworkauth" - - os: windows-2022 - name: "Windows-MinGW-w64" - msystem: clang64 - vcvars_arch: "amd64_x86" + # - os: windows-2022 + # name: "Windows-MinGW-w64" + # msystem: clang64 + # vcvars_arch: "amd64_x86" - os: windows-2022 name: "Windows-MSVC" @@ -82,33 +82,33 @@ jobs: qt_version: "6.7.0" qt_modules: "qt5compat qtimageformats qtnetworkauth" - - 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.7.0" - qt_modules: "qt5compat qtimageformats qtnetworkauth" - - - os: macos-12 - name: macOS - macosx_deployment_target: 11.0 - qt_ver: 6 - qt_host: mac - qt_arch: "" - qt_version: "6.7.0" - qt_modules: "qt5compat qtimageformats qtnetworkauth" - - - os: macos-12 - name: macOS-Legacy - macosx_deployment_target: 10.13 - qt_ver: 5 - qt_host: mac - qt_version: "5.15.2" - qt_modules: "qtnetworkauth" + # - 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.7.0" + # qt_modules: "qt5compat qtimageformats qtnetworkauth" + + # - os: macos-12 + # name: macOS + # macosx_deployment_target: 11.0 + # qt_ver: 6 + # qt_host: mac + # qt_arch: "" + # qt_version: "6.7.0" + # qt_modules: "qt5compat qtimageformats qtnetworkauth" + + # - os: macos-12 + # name: macOS-Legacy + # macosx_deployment_target: 10.13 + # qt_ver: 5 + # qt_host: mac + # qt_version: "5.15.2" + # qt_modules: "qtnetworkauth" runs-on: ${{ matrix.os }} @@ -608,20 +608,21 @@ jobs: run: | ccache -s - flatpak: - runs-on: ubuntu-latest - container: - image: bilelmoussaoui/flatpak-github-actions:kde-6.7 - 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-6.7 + # 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 9efafc8cc2..8b06936165 100644 --- a/.github/workflows/trigger_builds.yml +++ b/.github/workflows/trigger_builds.yml @@ -20,13 +20,22 @@ on: - ".github/ISSUE_TEMPLATE/**" - ".markdownlint**" workflow_dispatch: - + inputs: + build_type: + description: 'Build type' + required: true + type: choice + options: + - Release + - Debug + - RelWithDebInfo + - MinSizeRel jobs: build_debug: name: Build Debug uses: ./.github/workflows/build.yml with: - build_type: Debug + build_type: ${{ inputs.build_type || 'Release' }} is_qt_cached: true secrets: SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}