Skip to content

Commit 049e10c

Browse files
Merge pull request #338 from github/update-v1-494945f7
Merge main into v1
2 parents 1dd265a + 494945f commit 049e10c

Some content is hidden

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

54 files changed

+1424
-302
lines changed

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
"@typescript-eslint/prefer-regexp-exec": "off",
5050
"@typescript-eslint/require-await": "off",
5151
"@typescript-eslint/restrict-template-expressions": "off",
52-
"func-style": "off",
53-
"github/no-then": "off"
52+
"func-style": "off"
5453
}
5554
}]
5655
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Check Expected Release Files
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- .github/workflows/check-expected-release-files.yml
7+
- src/defaults.json
8+
9+
jobs:
10+
check-expected-release-files:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout CodeQL Action
15+
uses: actions/checkout@v2
16+
- name: Check Expected Release Files
17+
run: |
18+
bundle_version="$(cat "./src/defaults.json" | jq -r ".bundleVersion")"
19+
set -x
20+
for expected_file in "codeql-bundle.tar.gz" "codeql-bundle-linux64.tar.gz" "codeql-bundle-osx64.tar.gz" "codeql-bundle-win64.tar.gz" "codeql-runner-linux" "codeql-runner-macos" "codeql-runner-win.exe"; do
21+
curl --location --fail --head --request GET "https://github.com/github/codeql-action/releases/download/$bundle_version/$expected_file" > /dev/null
22+
done

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches: [main, v1]
66
pull_request:
7+
branches: [main, v1]
78

89
jobs:
910
build:

.github/workflows/integration-testing.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,29 @@ jobs:
129129
env:
130130
TEST_MODE: true
131131

132+
go-custom-tracing-autobuild:
133+
# No need to test Go autobuild on multiple OSes since
134+
# we're testing Go custom tracing with a manual build on all OSes.
135+
runs-on: ubuntu-latest
136+
env:
137+
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
138+
139+
steps:
140+
- uses: actions/checkout@v2
141+
- name: Move codeql-action
142+
shell: bash
143+
run: |
144+
mkdir ../action
145+
mv * .github ../action/
146+
mv ../action/tests/multi-language-repo/{*,.github} .
147+
- uses: ./../action/init
148+
with:
149+
languages: go
150+
- uses: ./../action/autobuild
151+
- uses: ./../action/analyze
152+
env:
153+
TEST_MODE: true
154+
132155
multi-language-repo_rubocop:
133156
runs-on: ubuntu-latest
134157

lib/actions-util.js

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

lib/actions-util.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.

0 commit comments

Comments
 (0)