Skip to content

Commit

Permalink
Merge branch 'main' into rneatherway/on-push-notice
Browse files Browse the repository at this point in the history
  • Loading branch information
Robin Neatherway authored and GitHub committed Dec 1, 2020
2 parents 8e0e34a + f65e6c4 commit 1010b1f
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/check-expected-release-files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Check Expected Release Files

on:
pull_request:
paths:
- .github/workflows/check-expected-release-files.yml
- src/defaults.json

jobs:
check-expected-release-files:
runs-on: ubuntu-latest

steps:
- name: Checkout CodeQL Action
uses: actions/checkout@v2
- name: Check Expected Release Files
run: |
bundle_version="$(cat "./src/defaults.json" | jq -r ".bundleVersion")"
set -x
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
curl --location --fail --head --request GET "https://github.com/github/codeql-action/releases/download/$bundle_version/$expected_file" > /dev/null
done
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [main, v1]
pull_request:
branches: [main, v1]

jobs:
build:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/integration-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,29 @@ jobs:
env:
TEST_MODE: true

go-custom-tracing-autobuild:
# No need to test Go autobuild on multiple OSes since
# we're testing Go custom tracing with a manual build on all OSes.
runs-on: ubuntu-latest
env:
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"

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: go
- uses: ./../action/autobuild
- uses: ./../action/analyze
env:
TEST_MODE: true

multi-language-repo_rubocop:
runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20201106"
"bundleVersion": "codeql-bundle-20201127"
}
2 changes: 1 addition & 1 deletion src/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20201106"
"bundleVersion": "codeql-bundle-20201127"
}

0 comments on commit 1010b1f

Please sign in to comment.