From 40e5aacd68bfbfa61d1b0f10a29a13eff1689ff7 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sun, 24 Dec 2023 23:30:29 +0200 Subject: [PATCH 1/7] RareStyle: Add proper disabled colors for wrappers widget --- .../stylesheets/RareStyle/__init__.py | Bin 26381 -> 26419 bytes .../stylesheets/RareStyle/stylesheet.qss | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index a166b50e61db484c88927d616480a609243214b6..cac9ca629582e7f73652326a29cd17d20567a70e 100644 GIT binary patch delta 662 zcmZWmJ4nM&6eVd|MGypQYSBe23W7GxOEpzQ6!ACs1Apzaw#iEd7oGGu>LiFiF1WZT zu5ND;CuavIM{!Xc1t(YUORQjBlK0L%=iYnHJ9<>aqjLH#win(a;$ym96PMa%1QxYP zaWP)hk}l=hK3Ye)Vf=i#WmC>FVypJp9JBi=H}UQ|`1cVnBR@lV4$ls1b9lFMh-WGH z{YnSP=tG5tRYJu1XjBvRvl|i7Gq_uW3*1Dm^Ggcc(tT(s#NfDa2l?e!NECM9Y2^$~ z@&_=~vAQ0*Qrzz>AxNS4WScG7KXcgc0DwZc_P8K|_WQdoEE!=PDscN=sqrSY;Au bg(cP~xq(~N$iO*E%P0Ed62T6kdtb^o5MSJj delta 713 zcmZvZJ4nM&6oyG-A4t(kq`pOP6QoH^(-u?^ovfgP*lKS}URRtHUA&`iA}Gq)UBuBr z?jX1b&f;Tt5ClbVaH%dLo}`c1>Jqs3|L^(#^M&6CdpE+tGk*)6i~KdTA;RRs7<@!p zqN+`r36tf@m#Hbj5^3Juwjb}8lZ3_bOijX)%Y-Q^VOj$3G{RJsPiJ<6{A;o#^5bx^ ziDxs{BILvUa2XortFt{Kv}R_`UY^9`tpx$Da!+te4&i7q2z^Tj{3Jgl!0FNsoGfla zD0cyBejT>6+n^U71PvyN63i7_J7tW;_;N+3CX*E`lX49My3}r3bs`#46wZo+9cZ)a zHM~)(lO>7PR(7Z2Llf@xPIxSY{S=)xd>hlg1g%twbi}cV(HN!~UR4}HwMK*W%ithP z*BP+VNW7Zh#}lP|O`j4x0)a9CcsIMCWJDd0x4qA_K(~8g-i-RnYo}5FyLQTOlbJGt zc<=`%t3SO))C1$AGKR&P{sHoC_QHx4g%)!h?(80?i^s?B@^R}7*peTgdu##@VydAS Za|DlxyPcB8!1n6IMjjO{!bj<+@B@J{^PT_z diff --git a/rare/resources/stylesheets/RareStyle/stylesheet.qss b/rare/resources/stylesheets/RareStyle/stylesheet.qss index 6c95340c..796d92b5 100644 --- a/rare/resources/stylesheets/RareStyle/stylesheet.qss +++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss @@ -745,3 +745,7 @@ QLabel#WrapperSettingsLabel { border-color: rgb( 47, 79, 79); background-color: rgb( 40, 42, 46); } +QLabel#WrapperSettingsLabel:disabled { + border-color: rgb( 67, 71, 77); + background-color: rgb( 32, 34, 37); +} \ No newline at end of file From e5b445d37a93009118122641bddd27e50c57b12a Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 00:48:01 +0200 Subject: [PATCH 2/7] Workflows: bump windows and macos to python 3.12 --- .github/workflows/job_cx-freeze-msi.yml | 2 +- .github/workflows/job_cx-freeze-zip.yml | 2 +- .github/workflows/job_macos.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/job_cx-freeze-msi.yml b/.github/workflows/job_cx-freeze-msi.yml index f281d005..2a13f089 100644 --- a/.github/workflows/job_cx-freeze-msi.yml +++ b/.github/workflows/job_cx-freeze-msi.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v4 with: cache: pip - python-version: '3.11' + python-version: '3.12' check-latest: true architecture: x64 - name: Install Build Dependencies diff --git a/.github/workflows/job_cx-freeze-zip.yml b/.github/workflows/job_cx-freeze-zip.yml index 4fa80d6e..0398e0f3 100644 --- a/.github/workflows/job_cx-freeze-zip.yml +++ b/.github/workflows/job_cx-freeze-zip.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v4 with: cache: pip - python-version: '3.11' + python-version: '3.12' check-latest: true architecture: x64 - name: Install build dependencies diff --git a/.github/workflows/job_macos.yml b/.github/workflows/job_macos.yml index 0ca75122..16e7a592 100644 --- a/.github/workflows/job_macos.yml +++ b/.github/workflows/job_macos.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v4 with: cache: pip - python-version: '3.11' + python-version: '3.12' check-latest: true - name: Install Build Dependencies run: pip install pyinstaller From 9a56f4b0794d08cba5bb71f72500e64cd737f154 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 17:24:26 +0200 Subject: [PATCH 3/7] Workflows: Add version reusable workflow --- .github/workflows/job_version.yml | 41 +++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 24 ++---------------- 3 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/job_version.yml diff --git a/.github/workflows/job_version.yml b/.github/workflows/job_version.yml new file mode 100644 index 00000000..b93f5014 --- /dev/null +++ b/.github/workflows/job_version.yml @@ -0,0 +1,41 @@ +name: job_version + +on: + workflow_call: + outputs: + tag_abbrev: + value: ${{ jobs.version.outputs.tag_abbrev }} + tag_offset: + value: ${{ jobs.version.outputs.tag_offset }} + sha_short: + value: ${{ jobs.version.outputs.sha_short }} + full_desc: + value: ${{ jobs.version.outputs.full_desc }} + branch: + value: ${{ jobs.version.outputs.branch }} + + +jobs: + version: + name: Version + runs-on: ubuntu-latest + outputs: + tag_abbrev: ${{ steps.describe.outputs.tag_abbrev }} + tag_offset: ${{ steps.describe.outputs.tag_offset }} + sha_short: ${{ steps.describe.outputs.sha_short }} + full_desc: ${{ steps.describe.outputs.full_desc }} + branch: ${{ steps.describe.outputs.branch }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Describe + id: describe + shell: bash + run: | + tag_abbrev=$(git tag --sort=v:refname | grep -oE "(^[0-9]+\.[0-9]+(.[0-9]+)?)$" | tail -1) + echo "tag_abbrev=$tag_abbrev" >> $GITHUB_OUTPUT + echo "tag_offset=$(git rev-list $tag_abbrev..HEAD --count)" >> $GITHUB_OUTPUT + echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + echo "full_desc=$(git describe --long --tags)" >> $GITHUB_OUTPUT + echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 385617b3..85cb918e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ permissions: jobs: - describe: + title: name: Version ${{ github.ref_name }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index acb00e01..6e6020b4 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -14,29 +14,9 @@ jobs: version: name: Describe - runs-on: ubuntu-latest - outputs: - tag_abbrev: ${{ steps.describe.outputs.tag_abbrev }} - tag_offset: ${{ steps.describe.outputs.tag_offset }} - sha_short: ${{ steps.describe.outputs.sha_short }} - full_desc: ${{ steps.describe.outputs.full_desc }} - branch: ${{ steps.describe.outputs.branch }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Describe version - id: describe - shell: bash - run: | - tag_abbrev=$(git tag --sort=v:refname | grep -oE "(^[0-9]+\.[0-9]+(.[0-9]+)?)$" | tail -1) - echo "tag_abbrev=$tag_abbrev" >> $GITHUB_OUTPUT - echo "tag_offset=$(git rev-list $tag_abbrev..HEAD --count)" >> $GITHUB_OUTPUT - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "full_desc=$(git describe --long --tags)" >> $GITHUB_OUTPUT - echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + uses: ./.github/workflows/job_version.yml - describe: + title: needs: version name: Version ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} runs-on: ubuntu-latest From 7309e6f1a695c62d8d6c5adff270efa0418afa53 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 17:34:59 +0200 Subject: [PATCH 4/7] Workflows: Update issue template --- .github/ISSUE_TEMPLATE/bug_report.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 42b2b786..92852256 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -42,6 +42,9 @@ Add any other context about the problem here. **Error message** You can find logs in these locations -- Windows: `C:\Users\\AppData\Local\Rare\Rare\cache\logs` -- Linux: `~/.cache/Rare/Rare/logs` -- masOS: `/Users//Library/Caches/Rare/Rare/logs` + +| OS | Path | +|---------|----------------------------------------------------------| +| Windows | `C:\Users\\AppData\Local\Rare\Rare\cache\logs` | +| Linux | `/home//.cache/Rare/Rare/logs` | +| masOS | `/Users//Library/Caches/Rare/Rare/logs` | From 040e03716fdc207f381b68a238c00cf7f1f4afdd Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:05:40 +0200 Subject: [PATCH 5/7] Workflows: Setup prerelease workflow --- .github/workflows/job_release.yml | 7 +- .github/workflows/job_version.yml | 10 +-- .github/workflows/prerelease.yml | 118 ++++++++++++++++++++++++++++++ .github/workflows/release.yml | 6 ++ .github/workflows/snapshot.yml | 15 ++-- 5 files changed, 138 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/prerelease.yml diff --git a/.github/workflows/job_release.yml b/.github/workflows/job_release.yml index 02b46d6c..46e896df 100644 --- a/.github/workflows/job_release.yml +++ b/.github/workflows/job_release.yml @@ -3,6 +3,9 @@ name: job_release on: workflow_call: inputs: + version: + required: true + type: string file1: required: true type: string @@ -30,7 +33,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ inputs.file1 }} asset_name: ${{ inputs.name1 }} - tag: ${{ github.ref }} + tag: ${{ inputs.version }} overwrite: true - name: Download ${{ inputs.name2 }} artifact @@ -45,5 +48,5 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ inputs.file2 }} asset_name: ${{ inputs.name2 }} - tag: ${{ github.ref }} + tag: ${{ inputs.version }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/job_version.yml b/.github/workflows/job_version.yml index b93f5014..a8097c2b 100644 --- a/.github/workflows/job_version.yml +++ b/.github/workflows/job_version.yml @@ -3,14 +3,8 @@ name: job_version on: workflow_call: outputs: - tag_abbrev: - value: ${{ jobs.version.outputs.tag_abbrev }} - tag_offset: - value: ${{ jobs.version.outputs.tag_offset }} - sha_short: - value: ${{ jobs.version.outputs.sha_short }} - full_desc: - value: ${{ jobs.version.outputs.full_desc }} + version: + value: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} branch: value: ${{ jobs.version.outputs.branch }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml new file mode 100644 index 00000000..ddc5aa59 --- /dev/null +++ b/.github/workflows/prerelease.yml @@ -0,0 +1,118 @@ + +name: "Prerelease" + + +on: + workflow_dispatch: + + +permissions: + contents: write + + +jobs: + + version: + name: Describe + uses: ./.github/workflows/job_version.yml + + title: + needs: version + name: Version ${{ needs.version.outputs.version }} + runs-on: ubuntu-latest + steps: + - run: "true" + + ubuntu: + needs: version + name: Ubuntu + uses: ./.github/workflows/job_ubuntu.yml + with: + version: ${{ needs.version.outputs.version }} + ubuntu-release: + needs: ubuntu + name: Ubuntu + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.deb + name1: Rare-${{ needs.version.outputs.version }}.deb + + appimage: + needs: version + name: AppImage + uses: ./.github/workflows/job_appimage.yml + with: + version: ${{ needs.version.outputs.version }} + appimage-release: + needs: appimage + name: AppImage + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.AppImage + name1: Rare-${{ needs.version.outputs.version }}.AppImage + file2: Rare.AppImage.zsync + name2: Rare-${{ needs.version.outputs.version }}.AppImage.zsync + + nuitka-win: + if: ${{ false }} + needs: version + name: Nuitka Windows + uses: ./.github/workflows/job_nuitka-win.yml + with: + version: ${{ needs.version.outputs.version }} + nuitka-win-release: + needs: nuitka-win + name: Nuitka Windows + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare-Windows.zip + name1: Rare-Windows-${{ needs.version.outputs.version }}.zip + + cx-freeze-msi: + needs: version + name: cx-Freeze msi + uses: ./.github/workflows/job_cx-freeze-msi.yml + with: + version: ${{ needs.version.outputs.version }} + cx-freeze-msi-release: + needs: cx-freeze-msi + name: cx-Freeze msi + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.msi + name1: Rare-${{ needs.version.outputs.version }}.msi + + cx-freeze-zip: + needs: version + name: cx-Freeze zip + uses: ./.github/workflows/job_cx-freeze-zip.yml + with: + version: ${{ needs.version.outputs.version }} + cx-freeze-zip-release: + needs: cx-freeze-zip + name: cx-Freeze zip + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare-Windows.zip + name1: Rare-Windows-${{ needs.version.outputs.version }}.zip + + macos: + needs: version + name: MacOS + uses: ./.github/workflows/job_macos.yml + with: + version: ${{ needs.version.outputs.version }} + macos-release: + needs: macos + name: MacOS + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.dmg + name1: Rare-${{ needs.version.outputs.version }}.dmg + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85cb918e..ce1d4a23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,7 @@ jobs: name: Ubuntu uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.deb name1: Rare-${{ github.ref_name }}.deb @@ -50,6 +51,7 @@ jobs: name: AppImage uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.AppImage name1: Rare-${{ github.ref_name }}.AppImage file2: Rare.AppImage.zsync @@ -66,6 +68,7 @@ jobs: name: Nuitka Windows uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare-Windows.zip name1: Rare-Windows-${{ github.ref_name }}.zip @@ -79,6 +82,7 @@ jobs: name: cx-Freeze msi uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.msi name1: Rare-${{ github.ref_name }}.msi @@ -92,6 +96,7 @@ jobs: name: cx-Freeze zip uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare-Windows.zip name1: Rare-Windows-${{ github.ref_name }}.zip @@ -105,6 +110,7 @@ jobs: name: MacOS uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.dmg name1: Rare-${{ github.ref_name }}.dmg diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6e6020b4..41e434f1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,7 +3,6 @@ name: "Snapshot" on: - workflow_dispatch: pull_request: branches: - main @@ -18,7 +17,7 @@ jobs: title: needs: version - name: Version ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + name: Version ${{ needs.version.outputs.version }} runs-on: ubuntu-latest steps: - run: "true" @@ -28,14 +27,14 @@ jobs: name: Ubuntu uses: ./.github/workflows/job_ubuntu.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} appimage: needs: version name: AppImage uses: ./.github/workflows/job_appimage.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} nuitka-win: if: ${{ false }} @@ -43,26 +42,26 @@ jobs: name: Nuitka Windows uses: ./.github/workflows/job_nuitka-win.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} cx-freeze-msi: needs: version name: cx-Freeze msi uses: ./.github/workflows/job_cx-freeze-msi.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} cx-freeze-zip: needs: version name: cx-Freeze zip uses: ./.github/workflows/job_cx-freeze-zip.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} macos: needs: version name: MacOS uses: ./.github/workflows/job_macos.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} From a3da8e339aa155749a1fec3910006b34e92bcf6b Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:35:15 +0200 Subject: [PATCH 6/7] Workflows: Merge pre-release and snapshot workflows When the snapshot is manually triggered, it will also create a pre-release --- .github/workflows/prerelease.yml | 23 +++++++---- .github/workflows/release.yml | 4 +- .github/workflows/snapshot.yml | 71 +++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 11 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index ddc5aa59..105ad04b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -23,6 +23,13 @@ jobs: steps: - run: "true" + prerelease: + needs: version + name: Create pre-release + runs-on: ubuntu-latest + steps: + - run: "true" + ubuntu: needs: version name: Ubuntu @@ -30,7 +37,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} ubuntu-release: - needs: ubuntu + needs: [ubuntu, prerelease] name: Ubuntu uses: ./.github/workflows/job_release.yml with: @@ -45,7 +52,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} appimage-release: - needs: appimage + needs: [appimage, prerelease] name: AppImage uses: ./.github/workflows/job_release.yml with: @@ -63,7 +70,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} nuitka-win-release: - needs: nuitka-win + needs: [nuitka-win, prerelease] name: Nuitka Windows uses: ./.github/workflows/job_release.yml with: @@ -78,7 +85,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} cx-freeze-msi-release: - needs: cx-freeze-msi + needs: [cx-freeze-msi, prerelease] name: cx-Freeze msi uses: ./.github/workflows/job_release.yml with: @@ -93,7 +100,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} cx-freeze-zip-release: - needs: cx-freeze-zip + needs: [cx-freeze-zip, prerelease] name: cx-Freeze zip uses: ./.github/workflows/job_release.yml with: @@ -103,13 +110,13 @@ jobs: macos: needs: version - name: MacOS + name: macOS uses: ./.github/workflows/job_macos.yml with: version: ${{ needs.version.outputs.version }} macos-release: - needs: macos - name: MacOS + needs: [macos, prerelease] + name: macOS uses: ./.github/workflows/job_release.yml with: version: ${{ needs.version.outputs.version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce1d4a23..adc29d51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,13 +101,13 @@ jobs: name1: Rare-Windows-${{ github.ref_name }}.zip macos: - name: MacOS + name: macOS uses: ./.github/workflows/job_macos.yml with: version: ${{ github.ref_name }} macos-release: needs: macos - name: MacOS + name: macOS uses: ./.github/workflows/job_release.yml with: version: ${{ github.ref_name }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 41e434f1..c5c7febd 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,12 +3,17 @@ name: "Snapshot" on: + workflow_dispatch: pull_request: branches: - main types: [closed] +permissions: + contents: write + + jobs: version: @@ -22,12 +27,29 @@ jobs: steps: - run: "true" + prerelease: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: version + name: Create pre-release + runs-on: ubuntu-latest + steps: + - run: "true" + ubuntu: needs: version name: Ubuntu uses: ./.github/workflows/job_ubuntu.yml with: version: ${{ needs.version.outputs.version }} + ubuntu-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [ubuntu, prerelease] + name: Ubuntu + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.deb + name1: Rare-${{ needs.version.outputs.version }}.deb appimage: needs: version @@ -35,6 +57,17 @@ jobs: uses: ./.github/workflows/job_appimage.yml with: version: ${{ needs.version.outputs.version }} + appimage-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [appimage, prerelease] + name: AppImage + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.AppImage + name1: Rare-${{ needs.version.outputs.version }}.AppImage + file2: Rare.AppImage.zsync + name2: Rare-${{ needs.version.outputs.version }}.AppImage.zsync nuitka-win: if: ${{ false }} @@ -43,6 +76,15 @@ jobs: uses: ./.github/workflows/job_nuitka-win.yml with: version: ${{ needs.version.outputs.version }} + nuitka-win-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [nuitka-win, prerelease] + name: Nuitka Windows + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare-Windows.zip + name1: Rare-Windows-${{ needs.version.outputs.version }}.zip cx-freeze-msi: needs: version @@ -50,6 +92,15 @@ jobs: uses: ./.github/workflows/job_cx-freeze-msi.yml with: version: ${{ needs.version.outputs.version }} + cx-freeze-msi-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [cx-freeze-msi, prerelease] + name: cx-Freeze msi + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.msi + name1: Rare-${{ needs.version.outputs.version }}.msi cx-freeze-zip: needs: version @@ -57,11 +108,29 @@ jobs: uses: ./.github/workflows/job_cx-freeze-zip.yml with: version: ${{ needs.version.outputs.version }} + cx-freeze-zip-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [cx-freeze-zip, prerelease] + name: cx-Freeze zip + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare-Windows.zip + name1: Rare-Windows-${{ needs.version.outputs.version }}.zip macos: needs: version - name: MacOS + name: macOS uses: ./.github/workflows/job_macos.yml with: version: ${{ needs.version.outputs.version }} + macos-release: + if: ${{ github.event_name == "workflow_dispatch" }} + needs: [macos, prerelease] + name: macOS + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.dmg + name1: Rare-${{ needs.version.outputs.version }}.dmg From f6933a35894636d6fd838fe58c2badedfc23df22 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:50:42 +0200 Subject: [PATCH 7/7] Workflows: Add toggle for pre-release when invoked manually --- .github/workflows/prerelease.yml | 125 ------------------------------- .github/workflows/snapshot.yml | 20 +++-- 2 files changed, 13 insertions(+), 132 deletions(-) delete mode 100644 .github/workflows/prerelease.yml diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml deleted file mode 100644 index 105ad04b..00000000 --- a/.github/workflows/prerelease.yml +++ /dev/null @@ -1,125 +0,0 @@ - -name: "Prerelease" - - -on: - workflow_dispatch: - - -permissions: - contents: write - - -jobs: - - version: - name: Describe - uses: ./.github/workflows/job_version.yml - - title: - needs: version - name: Version ${{ needs.version.outputs.version }} - runs-on: ubuntu-latest - steps: - - run: "true" - - prerelease: - needs: version - name: Create pre-release - runs-on: ubuntu-latest - steps: - - run: "true" - - ubuntu: - needs: version - name: Ubuntu - uses: ./.github/workflows/job_ubuntu.yml - with: - version: ${{ needs.version.outputs.version }} - ubuntu-release: - needs: [ubuntu, prerelease] - name: Ubuntu - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare.deb - name1: Rare-${{ needs.version.outputs.version }}.deb - - appimage: - needs: version - name: AppImage - uses: ./.github/workflows/job_appimage.yml - with: - version: ${{ needs.version.outputs.version }} - appimage-release: - needs: [appimage, prerelease] - name: AppImage - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare.AppImage - name1: Rare-${{ needs.version.outputs.version }}.AppImage - file2: Rare.AppImage.zsync - name2: Rare-${{ needs.version.outputs.version }}.AppImage.zsync - - nuitka-win: - if: ${{ false }} - needs: version - name: Nuitka Windows - uses: ./.github/workflows/job_nuitka-win.yml - with: - version: ${{ needs.version.outputs.version }} - nuitka-win-release: - needs: [nuitka-win, prerelease] - name: Nuitka Windows - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare-Windows.zip - name1: Rare-Windows-${{ needs.version.outputs.version }}.zip - - cx-freeze-msi: - needs: version - name: cx-Freeze msi - uses: ./.github/workflows/job_cx-freeze-msi.yml - with: - version: ${{ needs.version.outputs.version }} - cx-freeze-msi-release: - needs: [cx-freeze-msi, prerelease] - name: cx-Freeze msi - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare.msi - name1: Rare-${{ needs.version.outputs.version }}.msi - - cx-freeze-zip: - needs: version - name: cx-Freeze zip - uses: ./.github/workflows/job_cx-freeze-zip.yml - with: - version: ${{ needs.version.outputs.version }} - cx-freeze-zip-release: - needs: [cx-freeze-zip, prerelease] - name: cx-Freeze zip - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare-Windows.zip - name1: Rare-Windows-${{ needs.version.outputs.version }}.zip - - macos: - needs: version - name: macOS - uses: ./.github/workflows/job_macos.yml - with: - version: ${{ needs.version.outputs.version }} - macos-release: - needs: [macos, prerelease] - name: macOS - uses: ./.github/workflows/job_release.yml - with: - version: ${{ needs.version.outputs.version }} - file1: Rare.dmg - name1: Rare-${{ needs.version.outputs.version }}.dmg - diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c5c7febd..84d4c7f0 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -4,6 +4,12 @@ name: "Snapshot" on: workflow_dispatch: + inputs: + prerelease: + description: "Create a pre-release" + default: false + required: true + type: boolean pull_request: branches: - main @@ -28,7 +34,7 @@ jobs: - run: "true" prerelease: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: version name: Create pre-release runs-on: ubuntu-latest @@ -42,7 +48,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} ubuntu-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [ubuntu, prerelease] name: Ubuntu uses: ./.github/workflows/job_release.yml @@ -58,7 +64,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} appimage-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [appimage, prerelease] name: AppImage uses: ./.github/workflows/job_release.yml @@ -77,7 +83,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} nuitka-win-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [nuitka-win, prerelease] name: Nuitka Windows uses: ./.github/workflows/job_release.yml @@ -93,7 +99,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} cx-freeze-msi-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [cx-freeze-msi, prerelease] name: cx-Freeze msi uses: ./.github/workflows/job_release.yml @@ -109,7 +115,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} cx-freeze-zip-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [cx-freeze-zip, prerelease] name: cx-Freeze zip uses: ./.github/workflows/job_release.yml @@ -125,7 +131,7 @@ jobs: with: version: ${{ needs.version.outputs.version }} macos-release: - if: ${{ github.event_name == "workflow_dispatch" }} + if: ${{ inputs.prerelease }} needs: [macos, prerelease] name: macOS uses: ./.github/workflows/job_release.yml