Merge pull request #108 from github/update-v1-c3dcf26e

Merge main into v1
github · Jul 14, 2020 · e775d4e · e775d4e
2 parents 60fdcc2 + c3dcf26
commit e775d4e
Show file tree

Hide file tree

Showing 226 changed files with 104,400 additions and 10,771 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -10,4 +10,5 @@ queries:
   - uses: security-extended
   - uses: security-and-quality
 paths-ignore:
-  - tests
+  - tests
+  - lib
diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -93,7 +93,6 @@ jobs:
       env:
         TEST_MODE: true
 
-
   multi-language-repo_rubocop:
     runs-on: ubuntu-latest
 
@@ -124,3 +123,30 @@ jobs:
         sarif_file: rubocop.sarif
       env:
         TEST_MODE: true
+
+  test-proxy:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:18.04
+      options: --dns 127.0.0.1
+    services:
+      squid-proxy:
+        image: datadog/squid:latest
+        ports:
+          - 3128:3128
+    env:
+      https_proxy: http://squid-proxy:3128
+    steps:
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - uses: ./../action/init
+      with:
+        languages: javascript
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
@@ -7,6 +7,7 @@ on:
     # curl -H "Authorization: Bearer <token>" -X POST https://api.github.com/repos/github/codeql-action/dispatches -d '{"event_type":"update-release-branch"}'
     # Replace <token> with a personal access token from this page: https://github.com/settings/tokens
     types: [update-release-branch]
+  workflow_dispatch:
 
 jobs:
   update:

diff --git a/lib/analysis-paths.js b/lib/analysis-paths.js
diff --git a/lib/analysis-paths.js.map b/lib/analysis-paths.js.map
diff --git a/lib/analysis-paths.test.js b/lib/analysis-paths.test.js
diff --git a/lib/analysis-paths.test.js.map b/lib/analysis-paths.test.js.map
diff --git a/lib/api-client.js b/lib/api-client.js
diff --git a/lib/api-client.js.map b/lib/api-client.js.map
diff --git a/lib/autobuild.js b/lib/autobuild.js
diff --git a/lib/autobuild.js.map b/lib/autobuild.js.map