Skip to content

Commit 8ea621e

Browse files
Merge pull request #234 from github/update-v1-f2e557e7
Merge main into v1
2 parents c7c948a + f2e557e commit 8ea621e

File tree

552 files changed

+76372
-151665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

552 files changed

+76372
-151665
lines changed

.eslintrc.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,10 @@
4444
"@typescript-eslint/prefer-regexp-exec": "off",
4545
"@typescript-eslint/require-await": "off",
4646
"@typescript-eslint/restrict-template-expressions": "off",
47-
"eslint-comments/no-use": "off",
4847
"func-style": "off",
49-
"github/array-foreach": "off",
5048
"github/no-then": "off",
5149
"import/no-extraneous-dependencies": "off",
5250
"no-shadow": "off",
53-
"no-sparse-arrays": "off",
5451
"no-throw-literal": "off",
5552
"no-useless-escape": "off",
5653
"sort-imports": "off"

.github/workflows/integration-testing.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
os: [ubuntu-latest, windows-latest, macos-latest]
47+
tools: [~, latest]
4748
runs-on: ${{ matrix.os }}
4849

4950
steps:
@@ -56,6 +57,7 @@ jobs:
5657
mv ../action/tests/multi-language-repo/{*,.github} .
5758
- uses: ./../action/init
5859
with:
60+
tools: ${{ matrix.tools }}
5961
languages: cpp,csharp,java,javascript,python
6062
config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }}
6163
- name: Build code

.github/workflows/split.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#
2+
# Split the CodeQL Bundle into platform bundles
3+
#
4+
# Instructions:
5+
# 1. Upload the new codeql-bundle (codeql-bundle.tar.gz) as an asset of the
6+
# release (codeql-bundle-20200826)
7+
# 2. Take note of the CLI Release used by the bundle (e.g., v2.2.5)
8+
# 3. Manually launch this workflow file (via the Actions UI) specifying
9+
# - The CLI Release (e.g., v2.2.5)
10+
# - The release tag (e.g., codeql-bundle-20200826)
11+
# 4. If everything succeeds you should see 3 new assets.
12+
#
13+
14+
name: Split Bundle
15+
16+
on:
17+
workflow_dispatch:
18+
inputs:
19+
cli-release:
20+
description: 'CodeQL CLI Release (e.g., "v2.2.5")'
21+
required: true
22+
bundle-tag:
23+
description: 'Tag of the bundle release (e.g., "codeql-bundle-20200826")'
24+
required: true
25+
26+
jobs:
27+
build:
28+
runs-on: ubuntu-latest
29+
env:
30+
CLI_RELEASE: "${{ github.event.inputs.cli-release }}"
31+
RELEASE_TAG: "${{ github.event.inputs.bundle-tag }}"
32+
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
platform: ["linux64", "osx64", "win64"]
37+
38+
steps:
39+
- name: Resolve Upload URL for the release
40+
id: save_url
41+
run: |
42+
UPLOAD_URL=$(curl -sS \
43+
"https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}" \
44+
-H "Accept: application/json" \
45+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" | jq .upload_url | sed s/\"//g)
46+
echo ${UPLOAD_URL}
47+
echo "::set-output name=upload_url::${UPLOAD_URL}"
48+
49+
- name: Download CodeQL CLI and Bundle
50+
run: |
51+
wget --no-verbose "https://github.com/${GITHUB_REPOSITORY}/releases/download/${RELEASE_TAG}/codeql-bundle.tar.gz"
52+
wget --no-verbose "https://github.com/github/codeql-cli-binaries/releases/download/${CLI_RELEASE}/codeql-${{matrix.platform}}.zip"
53+
54+
- name: Create Platform Package
55+
# Replace the codeql-binaries with the platform specific ones
56+
run: |
57+
gunzip codeql-bundle.tar.gz
58+
tar -f codeql-bundle.tar --delete codeql
59+
unzip -q codeql-${{matrix.platform}}.zip
60+
tar -f codeql-bundle.tar --append codeql
61+
gzip codeql-bundle.tar
62+
mv codeql-bundle.tar.gz codeql-bundle-${{matrix.platform}}.tar.gz
63+
du -sh codeql-bundle-${{matrix.platform}}.tar.gz
64+
65+
- name: Upload Platform Package
66+
uses: actions/upload-release-asset@v1
67+
env:
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
with:
70+
upload_url: ${{ steps.save_url.outputs.upload_url }}
71+
asset_path: ./codeql-bundle-${{matrix.platform}}.tar.gz
72+
asset_name: codeql-bundle-${{matrix.platform}}.tar.gz
73+
asset_content_type: application/tar+gzip

lib/api-client.js

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

lib/api-client.js.map

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

lib/codeql.js

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

0 commit comments

Comments
 (0)