Merge branch 'main' into robertbrignull/external-token-fix

github · Jan 22, 2021 · 1013277 · 1013277
2 parents cb574a7 + 504cb5e
commit 1013277
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -54,6 +54,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
     - name: Build code
       shell: bash
@@ -93,6 +94,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
       with:
         tools: ${{ matrix.tools }}
@@ -126,6 +128,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
       with:
         languages: go
@@ -159,6 +162,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
       with:
         languages: go
@@ -185,6 +189,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
       with:
         languages: go
@@ -205,6 +210,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -246,6 +252,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
     - uses: ./../action/init
       with:
         languages: javascript
@@ -339,6 +346,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |
@@ -374,6 +382,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |
@@ -410,6 +419,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |
@@ -447,6 +457,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |
@@ -481,6 +492,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |
@@ -516,6 +528,7 @@ jobs:
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .
+        mv ../action/.github/workflows .github
 
     - name: Build runner
       run: |

diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml
@@ -3,7 +3,7 @@ description: 'Upload the analysis results'
 author: 'GitHub'
 inputs:
   sarif_file:
-    description: The SARIF file or directory of SARIF files to be uploaded.
+    description: The SARIF file or directory of SARIF files to be uploaded. Each upload should contain a maximum of 1000 results, any additional results are ignored.
     required: false
     default: '../results'
   checkout_path: