Replace controlTypes reason constants with controlTypes.OutputReason.… (

#24) * Replace controlTypes reason constantS with controlTypes.OutputReason.REASON Fixes issue #23 * Fix lint issues * Fix workflow * Improve workflow * Fix path in workflow * Use pull_request_target event * Use pull_request_target * Fix workflow * Use pull_request and pull_request_target events for different situations * Fix workflows * Fix workflows again
nvdaes · Apr 18, 2021 · b66e908 · b66e908
1 parent 4774527
commit b66e908
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/check-for-extended-ascii-and-utf-bom.yaml b/.github/workflows/check-for-extended-ascii-and-utf-bom.yaml
@@ -1,6 +1,6 @@
 name: Check that we dont have extended ascii or utf boms in our files
 
-on: [pull_request]
+on: [pull_request, pull_request_target]
 
 jobs:
   extendedAsciiAndBom:

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -1,9 +1,7 @@
 name: Lint diff
 
 on:
-  pull_request:
-    branches:
-      - master
+  [pull_request, pull_request_target]
 
 jobs:
 

diff --git a/.github/workflows/testWithNVDA.yaml b/.github/workflows/testWithNVDA.yaml
@@ -1,9 +1,8 @@
 name: Build and test NVDA add-on
 
 on:
-  pull_request:
-    branches:
-      - master
+  [pull_request, pull_request_target]
+
 jobs:
 
   addon:
@@ -124,17 +123,17 @@ jobs:
   pr-release:
     name: Pull Request Release
 
-    needs: NVDA
+    needs: nvda
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Download add-on
+    - name: Download artifacts
       uses: actions/download-artifact@v2
       with:
-        name: nvda-addon
+        path: artifacts
     - name: Calculate sha256
-      run: sha256sum *.nvda-addon > sha256.txt
+      run: sha256sum artifacts/nvda-addon/*.nvda-addon > sha256.txt
     - name: Automatic release
       uses: marvinpinto/action-automatic-releases@latest
       with:
@@ -143,5 +142,5 @@ jobs:
         prerelease: true
         title: PR ${{ github.event.pull_request.number }}
         files: |
-          *.nvda-addon
+          artifacts/**/*.*
           sha256.txt
diff --git a/addon/globalPlugins/placeMarkers/__init__.py b/addon/globalPlugins/placeMarkers/__init__.py
@@ -105,7 +105,7 @@ def doFindText(text, reverse=False, caseSensitive=False, willSayAllResume=False)
 				info.updateCaret()
 			speech.cancelSpeech()
 			info.move(textInfos.UNIT_LINE,1,endPoint="end")
-			speech.speakTextInfo(info,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET)
 		else:
 			wx.CallAfter(
 				gui.messageBox,
@@ -130,7 +130,7 @@ def moveToBookmark(position):
 		obj._set_selection(info)
 		speech.cancelSpeech()
 		info.move(textInfos.UNIT_LINE,1,endPoint="end")
-		speech.speakTextInfo(info,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET)
 
 def standardFileName(fileName):
 	notAllowed = re.compile("\?|:|\*|\t|<|>|\"|\/|\\||") # Invalid characters