Merge branch 'ghSigning' into try-ghSigning

Author: seanbudd

.git-blame-ignore-revs

@@ -27,3 +27,5 @@ f227ca64c7f4cb41f83f531436c6dd11cf3c1d58
 be112ed44cb68f622a770c72fd29dd10899e9d07
 # Fix E721
 73a3529d8b10eb73a45117eead906c0a9cb4c41b
+# String concatenation
+9616ef6b18b5c5a5b64037a640d205868e66b964

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,12 +8,15 @@ See https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
 -->
 
 ### Link to issue number:
+<!-- Use Closes/Fixes/Resolves #xxx to link this PR to the issue it is responding to. -->
 
 ### Summary of the issue:
 
-### Description of user facing changes
+### Description of user facing changes:
 
-### Description of development approach
+### Description of developer facing changes:
+
+### Description of development approach:
 
 ### Testing strategy:
 

.github/workflows/testAndPublish.yml

@@ -55,7 +55,7 @@ jobs:
         python-version: '3.11'
         architecture: x86
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Set version variables
       run: ci/scripts/setBuildVersionVars.ps1
     - name: Set scons args
@@ -94,7 +94,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Check comments for translators
       run: ci/scripts/tests/translationCheck.ps1
     - name: Upload artifact
@@ -118,7 +118,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: License check
       run: ci/scripts/tests/licenseCheck.ps1
 
@@ -134,7 +134,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Run unit tests
       run: ci/scripts/tests/unitTests.ps1
     - name: Replace relative paths in unit test results
@@ -173,7 +173,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Upload translations to Crowdin
       env:
         crowdinProjectID: ${{ vars.CROWDIN_PROJECT_ID }}
@@ -192,7 +192,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Set version variables
       run: ci/scripts/setBuildVersionVars.ps1
     - name: Set scons args
@@ -236,6 +236,10 @@ jobs:
         echo "    * Packaging metadata (library modules, installed python packages)" >> $GITHUB_STEP_SUMMARY
 
   systemTests:
+    strategy:
+      fail-fast: false
+      matrix:
+        testSuite: [chrome, installer, startupShutdown]
     name: Run system tests
     runs-on: windows-latest
     needs: createLauncher
@@ -247,7 +251,7 @@ jobs:
         key: ${{ github.ref }}-${{ github.run_id }}
         fail-on-cache-miss: true
     - name: Install the latest version of uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Get NVDA launcher
       id: getLauncher
       uses: actions/download-artifact@v4
@@ -258,29 +262,25 @@ jobs:
       run: ci/scripts/installNVDA.ps1
       env:
         nvdaLauncherDir: ${{ steps.getLauncher.outputs.download-path }}
-    - name: Upload install log
-      if: ${{ success() || failure() }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: Install log
-        path: |
-          testOutput/install
-          !testOutput/install/nvda_install_temp.log
     - name: Run system tests
       run: ci/scripts/tests/systemTests.ps1
       env:
         nvdaLauncherDir: ${{ steps.getLauncher.outputs.download-path }}
+        INCLUDE_SYSTEM_TEST_TAGS: ${{ matrix.testSuite }}
     - name: Upload system tests results
-      if: ${{ success() || failure() }}
+      if: ${{ failure() }}
       uses: actions/upload-artifact@v4
       with:
-        name: System tests results
-        path: testOutput/system
+        name: "System tests results (${{ matrix.testSuite }})"
+        path: |
+          testOutput/system
+          testOutput/install
+          !testOutput/install/nvda_install_temp.log
     - name: Publish system test report
       uses: mikepenz/action-junit-report@v5
-      if: ${{ success() || failure() }}
+      if: ${{ failure() }}
       with:
-        check_name: System tests
+        check_name: "System tests (${{ matrix.testSuite }})"
         detailed_summary: true
         annotate_only: true
         report_paths: testOutput/system/systemTests.xml
@@ -311,7 +311,7 @@ jobs:
         path: output/symbols.zip
     - name: Install the latest version of uv
       if: ${{ github.event_name == 'push' && env.feature_uploadSymbolsToMozilla }}
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
     - name: Upload symbols to Mozilla
       if: ${{ github.event_name == 'push' && env.feature_uploadSymbolsToMozilla }}
       continue-on-error: true

.gitignore

@@ -27,6 +27,7 @@ dlldata.c
 *.md.sub
 user_docs/*/*.html
 user_docs/*/*.css
+user_docs/*/*.ico
 extras/controllerClient/x86/nvdaController.h
 extras/controllerClient/x64
 extras/controllerClient/arm64

.pre-commit-config.yaml

@@ -53,14 +53,14 @@ repos:
     - id: debug-statements
     # Removes trailing whitespace.
     - id: trailing-whitespace
-      types_or: [python, c, c++, batch, markdown, toml, yaml]
+      types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
     # Ensures all files end in 1 (and only 1) newline.
     - id: end-of-file-fixer
-      types_or: [python, c, c++, batch, markdown, toml, yaml]
+      types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
     # Removes the UTF-8 BOM from files that have it.
     # See https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/codingStandards.md#encoding
     - id: fix-byte-order-marker
-      types_or: [python, c, c++, batch, markdown, toml, yaml]
+      types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
     # Validates TOML files.
     - id: check-toml
     # Validates YAML files.
@@ -91,7 +91,7 @@ repos:
         )
 
 - repo: https://github.com/asottile/add-trailing-comma
-  rev: v3.1.0
+  rev: v3.2.0
   hooks:
   # Ruff preserves indent/new-line formatting of function arguments, list items, and similar iterables,
   # if a trailing comma is added.
@@ -100,7 +100,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Matches Ruff version in pyproject.
-  rev: v0.8.1
+  rev: v0.11.12
   hooks:
     - id: ruff
       name: lint with ruff
@@ -109,14 +109,14 @@ repos:
       name: format with ruff
 
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.394
+  rev: v1.1.401
   hooks:
   - id: pyright
     alias: pyrightLocal
     name: Check types with pyright
 
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.396
+  rev: v1.1.401
   hooks:
   - id: pyright
     alias: pyrightCI
@@ -126,7 +126,7 @@ repos:
     stages: [manual]  # Only run from CI manually
 
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.6.14
+  rev: 0.7.9
   hooks:
     - id: uv-lock
       name: Verify uv lock file

appveyor/scripts/pushPackagingInfo.ps1

@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop";
 if (!$env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:versionType) {
-	# Not a pr build 
+	# Not a pr build
 	if ($env:APPVEYOR_REPO_BRANCH -eq "beta" -and $env:feature_crowdinSync) {
 		# Upload files to Crowdin for translation
 		uv run --with requests --directory appveyor crowdinSync.py uploadSourceFile 2 output\nvda.pot 2>&1

appveyor/scripts/sign.ps1

@@ -9,5 +9,4 @@ param(
 )
 
 Install-PSResource -Name SignPath -TrustRepository
-Import-Module -Name SignPath
 Submit-SigningRequest -ApiToken $ApiToken -InputArtifactPath $FileToSign -OutputArtifactPath $FileToSign -OrganizationId "12147e94-bba9-4fef-b29b-300398e90c5a" -ProjectSlug "NVDA" -SigningPolicySlug "release_signing_policy" -WaitForCompletion -Force

appveyor/scripts/tests/licenseCheck.ps1

@@ -1,6 +1,6 @@
 $licenseOutput = (Resolve-Path .\testOutput\license\)
 $licenseOutput = "$licenseOutput\licenseCheckResults.md"
-.\runlicensecheck.bat "$licenseOutput" 
+.\runlicensecheck.bat "$licenseOutput"
 if ($LastExitCode -ne 0) {
 	Set-AppveyorBuildVariable "testFailExitCode" $LastExitCode
 	Add-AppveyorMessage "FAIL: License check. See $licenseOutput for more information."

ci/README.md

@@ -33,6 +33,9 @@ The tests we perform are:
 * license checks
 * unit tests
 * system tests
+  * each test suite (i.e. .robot file) must be manually included by:
+    * adding a tag to `Force Tags` in the suite
+    * adding the tag to `systemTests.strategy.matrix.testSuite` in the [CI script](../.github/workflows/testAndPublish.yml)
 
 ## Artifacts