Merge branch 'main' into aeisenberg/checkout-path-commitoid

aeisenberg · aeisenberg · commit 74da9d1e5233 · 2022-03-10T10:50:13.000-08:00
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -13,6 +13,7 @@ jobs:
   lint-js:
     name: Lint
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -21,6 +22,7 @@ jobs:
 
   check-js:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -30,6 +32,7 @@ jobs:
   check-node-modules:
     name: Check modules up to date
     runs-on: macos-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -39,6 +42,7 @@ jobs:
   verify-pr-checks:
     name: Verify PR checks up to date
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -60,6 +64,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -69,6 +74,7 @@ jobs:
   runner-analyze-javascript-ubuntu:
     name: Runner ubuntu JS analyze
     needs: [check-js, check-node-modules]
+    timeout-minutes: 30
     runs-on: ubuntu-latest
 
     steps:
@@ -97,6 +103,7 @@ jobs:
   runner-analyze-javascript-windows:
     name: Runner windows JS analyze
     needs: [check-js, check-node-modules]
+    timeout-minutes: 30
     runs-on: windows-latest
 
     steps:
@@ -121,6 +128,7 @@ jobs:
   runner-analyze-javascript-macos:
     name: Runner macos JS analyze
     needs: [check-js, check-node-modules]
+    timeout-minutes: 30
     runs-on: macos-latest
 
     steps:
@@ -145,6 +153,7 @@ jobs:
   runner-analyze-csharp-ubuntu:
     name: Runner ubuntu C# analyze
     needs: [check-js, check-node-modules]
+    timeout-minutes: 30
     runs-on: ubuntu-latest
 
     steps:
@@ -184,6 +193,7 @@ jobs:
     needs: [check-js, check-node-modules]
     # Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
     # `windows-latest`.
+    timeout-minutes: 30
     runs-on: windows-2019
 
     steps:
@@ -228,6 +238,7 @@ jobs:
 
   runner-analyze-csharp-macos:
     name: Runner macos C# analyze
+    timeout-minutes: 30
     needs: [check-js, check-node-modules]
     runs-on: macos-latest
 
@@ -266,6 +277,7 @@ jobs:
 
   runner-analyze-csharp-autobuild-ubuntu:
     name: Runner ubuntu autobuild C# analyze
+    timeout-minutes: 30
     needs: [check-js, check-node-modules]
     runs-on: ubuntu-latest
 
@@ -301,6 +313,7 @@ jobs:
           TEST_MODE: true
 
   runner-analyze-csharp-autobuild-windows:
+    timeout-minutes: 30
     name: Runner windows autobuild C# analyze
     needs: [check-js, check-node-modules]
     # Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
@@ -343,6 +356,7 @@ jobs:
     name: Runner macos autobuild C# analyze
     needs: [check-js, check-node-modules]
     runs-on: macos-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -380,6 +394,7 @@ jobs:
     name: Runner upload sarif
     needs: [check-js, check-node-modules]
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
 
@@ -402,6 +417,7 @@ jobs:
     name: Runner ubuntu extractor RAM and threads options
     needs: [check-js, check-node-modules]
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   test-setup-python-scripts:
+    timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
         fail-fast: false
diff --git a/.github/workflows/release-runner.yml b/.github/workflows/release-runner.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   release-runner:
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     env:
       RELEASE_TAG: "${{ github.event.inputs.bundle-tag }}"
diff --git a/.github/workflows/split.yml b/.github/workflows/split.yml
@@ -26,6 +26,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     env:
       CLI_RELEASE: "${{ github.event.inputs.cli-release }}"
       RELEASE_TAG: "${{ github.event.inputs.bundle-tag }}"
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   update:
     name: Update dependencies
+    timeout-minutes: 30
     runs-on: macos-latest
     if: contains(github.event.pull_request.labels.*.name, 'Update dependencies') && (github.event.pull_request.head.repo.full_name == 'github/codeql-action')
     steps:
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   update:
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'github/codeql-action' }}
     steps:
diff --git a/.github/workflows/update-supported-enterprise-server-versions.yml b/.github/workflows/update-supported-enterprise-server-versions.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   update-supported-enterprise-server-versions:
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'github/codeql-action' }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,12 @@
 
 ## [UNRELEASED]
 
-- Update default CodeQL bundle version to 2.8.2.
-- Fix a bug where old results can be uploaded if the languages in a repository change when using a non-ephemeral self-hosted runner.
+No user facing changes.
+
+## 1.1.4 - 07 Mar 2022
+
+- Update default CodeQL bundle version to 2.8.2. [#950](https://github.com/github/codeql-action/pull/950)
+- Fix a bug where old results can be uploaded if the languages in a repository change when using a non-ephemeral self-hosted runner. [#955](https://github.com/github/codeql-action/pull/955)
 
 ## 1.1.3 - 23 Feb 2022
 
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
@@ -75,4 +75,4 @@
   "resolutions": {
     "glob-parent": ">=5.1.2"
   }
-}
+}
diff --git a/pr-checks/sync.py b/pr-checks/sync.py
@@ -85,6 +85,7 @@ def writeHeader(checkStream):
             }
         },
         'name': checkSpecification['name'],
+        'timeout-minutes': 30,
         'runs-on': '${{ matrix.os }}',
         'steps': steps
     }
diff --git a/runner/package-lock.json b/runner/package-lock.json
diff --git a/runner/package.json b/runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql-runner",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {
@@ -14,4 +14,4 @@
     "webpack": "^5.50.0",
     "webpack-cli": "^4.7.2"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codeql",`
`3`		`- "version": "1.1.4",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "CodeQL action",`
`6`	`6`	`"scripts": {`
`@@ -75,4 +75,4 @@`
`75`	`75`	`"resolutions": {`
`76`	`76`	`"glob-parent": ">=5.1.2"`
`77`	`77`	`}`
`78`		`-}`
	`78`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ def writeHeader(checkStream):`
`85`	`85`	`}`
`86`	`86`	`},`
`87`	`87`	`'name': checkSpecification['name'],`
	`88`	`+ 'timeout-minutes': 30,`
`88`	`89`	`'runs-on': '${{ matrix.os }}',`
`89`	`90`	`'steps': steps`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codeql-runner",`
`3`		`- "version": "1.1.4",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "CodeQL runner",`
`6`	`6`	`"scripts": {`
`@@ -14,4 +14,4 @@`
`14`	`14`	`"webpack": "^5.50.0",`
`15`	`15`	`"webpack-cli": "^4.7.2"`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`