Merge pull request #278 from openmainframeproject/FIx-unresolved-comm…

…ents-from-pullrequests-by-sam94dion Attempt to merge develop into branch
openmainframeproject · Aug 14, 2023 · 518d232 · 518d232
2 parents 2531970 + 7dc8bd8
commit 518d232
Show file tree

Hide file tree

Showing 36 changed files with 1,706 additions and 3,288 deletions.
diff --git a/.github/workflows/DeployExtension.yml b/.github/workflows/DeployExtension.yml
@@ -14,8 +14,8 @@ jobs:
         working-directory: ./vs code extension
     environment: production
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
       - run: npm install

diff --git a/.github/workflows/VSCodeBuild.yml b/.github/workflows/VSCodeBuild.yml
@@ -17,7 +17,7 @@ jobs:
         working-directory: ./vs code extension
     environment: production
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
       uses: actions/setup-node@v2
       with:

diff --git a/.github/workflows/VerifyAction.yml b/.github/workflows/VerifyAction.yml
@@ -1,11 +1,8 @@
 name: VerifyAction
 
 on:
-  push:
-    branches:
-      - '*'
   pull_request:
-    branches: [ main ]
+    branches: [ main,Developer ]
 
 jobs:
   build:
@@ -17,9 +14,9 @@ jobs:
         java-version: [8, 11]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: set up JDK 8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java-version }}
           distribution: 'adopt'

diff --git a/.gitignore b/.gitignore
@@ -120,3 +120,8 @@ nb-configuration.xml
 ## OS X
 ##############################
 .DS_Store
+output/testResults.txt
+approval-test-actual.txt
+default.conf
+null
+ParserErrorLog.txt
diff --git a/ALLTESTS b/ALLTESTS