Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into v1 #748

Merged
merged 33 commits into from
Sep 22, 2021
Merged

Merge main into v1 #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
542390c
Bump @typescript-eslint/parser from 4.29.1 to 4.29.2
dependabot[bot] Aug 19, 2021
6dc5d80
Update checked-in dependencies
invalid-email-address Aug 19, 2021
bf85bae
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/pa…
aeisenberg Sep 1, 2021
cda7fe1
Fix dependabot warning on path-parse
aeisenberg Sep 2, 2021
bf6f871
Bump typescript from 4.3.5 to 4.4.2
dependabot[bot] Sep 2, 2021
f27dc32
Update checked-in dependencies
invalid-email-address Sep 2, 2021
b0b34e5
Merge branch 'main' into aeisenberg/path-parse
edoardopirovano Sep 9, 2021
ac8bd3f
Update changelog and version after v1.0.14
invalid-email-address Sep 9, 2021
c0971ee
1.0.15
invalid-email-address Sep 9, 2021
bc190d2
Update checked-in dependencies
invalid-email-address Sep 9, 2021
aa1baf5
Merge pull request #735 from github/mergeback/v1.0.14-to-main-4854dd23
edoardopirovano Sep 9, 2021
d0b95ba
Merge branch 'main' into aeisenberg/path-parse
henrymercer Sep 9, 2021
31ae172
Bump release to `codeql-bundle-20210909`
edoardopirovano Sep 9, 2021
b5a94e0
Merge pull request #736 from edoardopirovano/bump-release
edoardopirovano Sep 9, 2021
58d2ade
Merge branch 'main' into aeisenberg/path-parse
henrymercer Sep 9, 2021
008b2cc
Merge pull request #725 from github/aeisenberg/path-parse
aeisenberg Sep 9, 2021
5b28adb
Merge branch 'main' into dependabot/npm_and_yarn/typescript-4.4.2
aeisenberg Sep 10, 2021
40568da
Fix compile errors introduced by typescript 4.4.2
aeisenberg Sep 10, 2021
adfea76
Merge pull request #726 from github/dependabot/npm_and_yarn/typescrip…
edoardopirovano Sep 14, 2021
6e8752e
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/pa…
aeisenberg Sep 14, 2021
9db151d
Dependabot: Ignore minor and patch versions
edoardopirovano Sep 14, 2021
a52e4c3
Merge pull request #708 from github/dependabot/npm_and_yarn/typescrip…
aeisenberg Sep 14, 2021
c93e88d
Merge branch 'main' into dependabot-ignore
edoardopirovano Sep 14, 2021
18cda24
Merge pull request #741 from edoardopirovano/dependabot-ignore
edoardopirovano Sep 14, 2021
58056a4
Fix dependabot ignore syntax
cklin Sep 14, 2021
7112cda
Merge pull request #743 from github/cklin/dependabot-ignore-fix
edoardopirovano Sep 14, 2021
fd4659d
Bump default CodeQL version to 2.6.2 bundle
edoardopirovano Sep 21, 2021
8caa080
Upload tracer logs
edoardopirovano Sep 21, 2021
014d3ea
Don't use shared compilation
edoardopirovano Sep 21, 2021
5a80cb1
Merge pull request #746 from github/edoardo/2.6.2-release
edoardopirovano Sep 21, 2021
6e631b9
Update supported GitHub Enterprise Server versions.
web-flow Sep 22, 2021
e40e887
Merge pull request #747 from github/update-supported-enterprise-serve…
edoardopirovano Sep 22, 2021
334262d
1.0.15
invalid-email-address Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@ updates:
day: "thursday" # Gives us a working day to merge this before our typical release
labels:
- "Update dependencies"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
- package-ecosystem: "npm"
directory: "/runner"
schedule:
interval: "weekly"
day: "thursday" # Gives us a working day to merge this before our typical release
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
12 changes: 9 additions & 3 deletions .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Build code
run: |
. ./codeql-runner/codeql-env.sh
$CODEQL_RUNNER dotnet build
$CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false

- name: Run analyze
run: |
Expand Down Expand Up @@ -211,7 +211,13 @@ jobs:
run: |
cat ./codeql-runner/codeql-env.sh | Invoke-Expression
$Env:CODEQL_EXTRACTOR_CSHARP_ROOT = ""
& $Env:CODEQL_RUNNER dotnet build
& $Env:CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false

- name: Upload tracer logs
uses: actions/upload-artifact@v2
with:
name: tracer-logs
path: ./codeql-runner/compound-build-tracer.log

- name: Run analyze
run: |
Expand Down Expand Up @@ -249,7 +255,7 @@ jobs:
shell: bash
run: |
. ./codeql-runner/codeql-env.sh
$CODEQL_RUNNER dotnet build
$CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false

- name: Run analyze
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CodeQL Action and CodeQL Runner Changelog

## 1.0.15 - 22 Sep 2021

- Update default CodeQL bundle version to 2.6.2. [#746](https://github.com/github/codeql-action/pull/746)

## 1.0.14 - 09 Sep 2021

- Update default CodeQL bundle version to 2.6.1. [#733](https://github.com/github/codeql-action/pull/733)
Expand Down
40 changes: 20 additions & 20 deletions lib/actions-util.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading