Merge pull request #230 from Toufool/always-clean-build-push-master

Clean build number on master push
Add printenv action
Remove 3.10 build

Author: Avasam

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main, master, develop, dev, 2.0.0]
+    branches: [main, master, develop, dev]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [develop, dev, 2.0.0]
+    branches: [develop, dev]
   schedule:
     - cron: "26 13 * * 6"
 

.github/workflows/lint-and-build.yml

@@ -22,7 +22,6 @@ on:
       - main
       - master
       - dev*
-      - 2.0.0
     paths:
       - "**.py"
       - "**.pyi"
@@ -143,7 +142,7 @@ jobs:
       fail-fast: false
       # Only the Python version we plan on shipping matters.
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11"]
     steps:
       - name: Checkout ${{ github.repository }}/${{ github.ref }}
         uses: actions/checkout@v3

.github/workflows/printenv.yml

@@ -0,0 +1,26 @@
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+name: printenv
+on:
+  workflow_dispatch: #  Allows manual builds
+    inputs:
+      excludeBuildNumber:
+        description: "Exclude build number"
+        required: true
+        default: false
+        type: boolean
+  # push:
+  #   branches:
+  #     - master
+  #     - dev
+
+env:
+  GITHUB_HEAD_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}
+  GITHUB_EXCLUDE_BUILD_NUMBER: ${{ inputs.excludeBuildNumber }}
+
+jobs:
+  printenv:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout ${{ github.repository }}/${{ github.ref }}
+        uses: actions/checkout@v3
+      - run: printenv

README.md

@@ -233,7 +233,7 @@ Still need help?
 See [CONTRIBUTING.md](/docs/CONTRIBUTING.md) for our contributing standards.  
 Refer to the [build instructions](/docs/build%20instructions.md) if you're interested in building the application yourself or running it in Python.  
 
-Not a developper? You can still help through the following methods:
+Not a developer? You can still help through the following methods:
 <!-- open enhancements sorted by reactions -->
 - Donating (see link below)
 - [Upvoting feature requests](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc+label%3Aenhancement) you are interested in

scripts/compile_resources.ps1

@@ -10,7 +10,14 @@ pyside6-rcc './res/resources.qrc' -o './src/gen/resources_rc.py'
 Write-Host 'Generated code from .ui files'
 
 $build_vars_path = "$PSScriptRoot/../src/gen/build_vars.py"
-$BUILD_NUMBER = If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true) { '' } Else { Get-Date -Format yyMMddHHmm }
+If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true -or (
+    $Env:GITHUB_EVENT_NAME -eq 'push' -and $Env:GITHUB_REF_NAME -eq 'master')
+) {
+  $BUILD_NUMBER = ''
+}
+Else {
+  $BUILD_NUMBER = Get-Date -Format yyMMddHHmm
+}
 $GITHUB_REPOSITORY = $Env:GITHUB_HEAD_REPOSITORY
 If (-not $GITHUB_REPOSITORY) {
   $repo_url = git config --get remote.origin.url

scripts/requirements.txt

@@ -12,9 +12,7 @@ packaging
 Pillow>=9.2  # gnome-screeshot checks
 psutil
 PyAutoGUI
-# 6.4.1 fixes the rare Illegal Operation issue from RTADan, but the dev wheels are currently broken :/
-# 2.0.0-beta.2 contains the fixes if anyone needs it.
-PyQt6>=6.4.0  # Python 3.11 support
+PyQt6>=6.4.2  # Python 3.11 support
 requests<=2.28.1  # 2.28.2 has issues with PyInstaller https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/534
 toml
 #