Skip to content

Commit 88fe7d0

Browse files
committed
Merge main and fix dependencies in package.json and package-lock.json
2 parents f256d36 + bd81588 commit 88fe7d0

13 files changed

Lines changed: 11 additions & 154 deletions

‎.github/workflows/__all-platform-bundle.yml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__multi-language-autodetect.yml‎

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__per-language-bundle-validation.yml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__swift-autobuild.yml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__swift-custom-build.yml‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -107,27 +107,7 @@ jobs:
107107
uses: ./analyze
108108
with:
109109
category: "/language:javascript"
110-
upload: ${{ (github.repository == 'github/codeql-action' && matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
111-
- name: Checkout
112-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
113-
- name: Initialize CodeQL
114-
uses: ./init
115-
id: init
116-
with:
117-
languages: javascript
118-
config-file: ./.github/codeql/codeql-config-javascript.yml
119-
tools: ${{ matrix.tools }}
120-
# confirm steps.init.outputs.codeql-path points to the codeql binary
121-
- name: Print CodeQL Version
122-
run: >
123-
"$CODEQL" version --format=json
124-
env:
125-
CODEQL: ${{steps.init.outputs.codeql-path}}
126-
- name: Perform CodeQL Analysis
127-
uses: ./analyze
128-
with:
129-
category: "/language:javascript"
130-
upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
110+
upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
131111

132112
analyze-other:
133113
if: github.triggering_actor != 'dependabot[bot]'
@@ -161,22 +141,4 @@ jobs:
161141
uses: ./analyze
162142
with:
163143
category: "/language:${{ matrix.language }}"
164-
upload: ${{ (github.repository == 'github/codeql-action' && github.event_name != 'merge_group' && 'always') || 'never' }}
165-
- name: Checkout
166-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
167-
- name: Initialize CodeQL
168-
uses: ./init
169-
with:
170-
languages: ${{ matrix.language }}
171-
build-mode: none
172-
config: >
173-
paths-ignore:
174-
- lib
175-
- tests
176-
queries:
177-
- uses: security-and-quality
178-
- name: Perform CodeQL Analysis
179-
uses: ./analyze
180-
with:
181-
category: "/language:${{ matrix.language }}"
182-
upload: ${{ (github.event_name != 'merge_group' && 'always') || 'never' }}
144+
upload: ${{ (github.event_name != 'merge_group' && 'always') || 'never' }}

‎package-lock.json‎

Lines changed: 8 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,10 @@
2626
"@actions/artifact-legacy": "npm:@actions/artifact@^1.1.2",
2727
"@actions/cache": "^5.3.0",
2828
"@actions/core": "^3.0.1",
29-
"@actions/exec": "^2.0.0",
30-
"@actions/core": "^2.0.3",
3129
"@actions/exec": "^3.0.0",
3230
"@actions/github": "^8.0.1",
3331
"@actions/glob": "^0.5.0",
3432
"@actions/http-client": "^4.0.1",
35-
"@actions/glob": "^0.7.0",
36-
"@actions/http-client": "^3.0.0",
3733
"@actions/io": "^2.0.0",
3834
"@actions/tool-cache": "^3.0.1",
3935
"@octokit/core": "^7.0.8",
@@ -64,8 +60,6 @@
6460
"@types/node-forge": "^1.3.14",
6561
"@types/sarif": "^2.1.7",
6662
"@types/semver": "^7.8.0",
67-
"@types/sinon": "^22.0.1",
68-
"ava": "^8.3.0",
6963
"@types/sinon": "^22.0.2",
7064
"ava": "^6.4.1",
7165
"esbuild": "^0.28.2",

‎pr-checks/checks/all-platform-bundle.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ operatingSystems:
44
- ubuntu
55
- os: macos
66
runner-image: macos-latest
7-
runner-image: macos-26-xlarge
87
- windows
98
versions:
109
- nightly-latest

‎pr-checks/checks/multi-language-autodetect.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ operatingSystems:
44
- ubuntu
55
- os: macos
66
runner-image: macos-latest
7-
runner-image: macos-26-xlarge
87
# Older CodeQL CLI versions only support Swift up to 6.1, which requires Xcode 16. That is
98
# not available on macOS 26, so run these versions on macOS 15 where we select Xcode 16
109
# below. See https://github.com/actions/runner-images/issues/14167.

0 commit comments

Comments
 (0)