Merge pull request #355 from loathingKernel/next

Update the workflows to include the ability to create pre-releases from the snapshot workflow

.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\<username>\AppData\Local\Rare\Rare\cache\logs`
-- Linux: `~/.cache/Rare/Rare/logs`
-- masOS: `/Users/<username>/Library/Caches/Rare/Rare/logs`
+
+| OS      | Path                                                     |
+|---------|----------------------------------------------------------|
+| Windows | `C:\Users\<username>\AppData\Local\Rare\Rare\cache\logs` |
+| Linux   | `/home/<username>/.cache/Rare/Rare/logs`                 |
+| masOS   | `/Users/<username>/Library/Caches/Rare/Rare/logs`        |

.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

.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

.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

.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

.github/workflows/job_version.yml

@@ -0,0 +1,35 @@
+name: job_version
+
+on:
+  workflow_call:
+    outputs:
+      version:
+        value: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }}
+      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

.github/workflows/release.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
 
-  describe:
+  title:
     name: Version ${{ github.ref_name }}
     runs-on: ubuntu-latest
     steps:
@@ -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,19 +96,21 @@ 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
 
   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 }}
       file1: Rare.dmg
       name1: Rare-${{ github.ref_name }}.dmg
 

.github/workflows/snapshot.yml

@@ -4,41 +4,39 @@ name: "Snapshot"
 
 on:
   workflow_dispatch:
+    inputs:
+      prerelease:
+        description: "Create a pre-release"
+        default: false
+        required: true
+        type: boolean
   pull_request:
     branches:
       - main
     types: [closed]
 
 
+permissions:
+  contents: write
+
+
 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 }}
+    name: Version ${{ needs.version.outputs.version }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: "true"
+
+  prerelease:
+    if: ${{ inputs.prerelease }}
+    needs: version
+    name: Create pre-release
     runs-on: ubuntu-latest
     steps:
       - run: "true"
@@ -48,14 +46,34 @@ 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 }}
+  ubuntu-release:
+    if: ${{ inputs.prerelease }}
+    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.tag_abbrev }}.${{ needs.version.outputs.tag_offset }}
+      version: ${{ needs.version.outputs.version }}
+  appimage-release:
+    if: ${{ inputs.prerelease }}
+    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 }}
@@ -63,26 +81,62 @@ 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 }}
+  nuitka-win-release:
+    if: ${{ inputs.prerelease }}
+    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.tag_abbrev }}.${{ needs.version.outputs.tag_offset }}
+      version: ${{ needs.version.outputs.version }}
+  cx-freeze-msi-release:
+    if: ${{ inputs.prerelease }}
+    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.tag_abbrev }}.${{ needs.version.outputs.tag_offset }}
+      version: ${{ needs.version.outputs.version }}
+  cx-freeze-zip-release:
+    if: ${{ inputs.prerelease }}
+    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.tag_abbrev }}.${{ needs.version.outputs.tag_offset }}
+      version: ${{ needs.version.outputs.version }}
+  macos-release:
+    if: ${{ inputs.prerelease }}
+    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
 

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);
+}