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.

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

Merge main into releases/v2 #1700

Merged
merged 48 commits into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
febbadf
Update the sarif schema file
aeisenberg May 2, 2023
ece3cbc
Update changelog
aeisenberg May 2, 2023
ef88842
Update jsonschema version
aeisenberg May 2, 2023
3df8023
Re-run sync.py with new ruamel.yaml
aeisenberg May 2, 2023
913b8b1
Update changelog and version after v2.3.3
invalid-email-address May 4, 2023
898fba2
Update checked-in dependencies
invalid-email-address May 4, 2023
1e1aca8
Merge pull request #1670 from github/mergeback/v2.3.3-to-main-29b1f65c
dbartol May 4, 2023
684c4b5
Update CHANGELOG.md
aeisenberg May 5, 2023
11fba50
Merge pull request #1668 from github/aeisenberg/update-sarif-schema
aeisenberg May 5, 2023
9824588
Fix broken regex
aeisenberg May 5, 2023
deb312c
Merge pull request #1672 from github/aeisenberg/sarif-again
adityasharad May 5, 2023
9c51a58
Bump peter-evans/create-pull-request from 5.0.0 to 5.0.1
dependabot[bot] May 8, 2023
95cfca7
Merge pull request #1673 from github/dependabot/github_actions/peter-…
aeisenberg May 8, 2023
edb138f
remove consts MismatchedBranches and MissingPushHook
shaikhul May 9, 2023
699855c
fix linter issue
shaikhul May 9, 2023
f8707c9
update changelog
shaikhul May 10, 2023
c26fc55
revert MissingPushHook checks changes
shaikhul May 10, 2023
0ccdbf8
Feature flag to disable python dependency installation
RasmusWL May 9, 2023
eb8a706
Update CHANGELOG.md
RasmusWL May 11, 2023
e5fdcd4
Apply suggestions from code review
shaikhul May 11, 2023
903cb27
recompile src
shaikhul May 11, 2023
a0755a7
Update CHANGELOG.md
shaikhul May 11, 2023
130884e
Merge pull request #1675 from shaikhul/remove-consts
henrymercer May 11, 2023
b8f39fe
Use features properly in `setupPythonExtractor`
RasmusWL May 12, 2023
cbc79bf
Merge branch 'main' into rasmuswl/python-disable-dependency-installation
RasmusWL May 12, 2023
c237da1
Fix linting errors
RasmusWL May 12, 2023
cc64156
Improve python warning message
RasmusWL May 12, 2023
fce87bb
Generate JS
RasmusWL May 12, 2023
cf58ef4
Update wording for CODEQL_PYTHON warning
RasmusWL May 15, 2023
e1cca25
Generate JS
RasmusWL May 15, 2023
dc0f6da
Update CHANGELOG.md
RasmusWL May 15, 2023
5489416
Merge pull request #1676 from github/rasmuswl/python-disable-dependen…
RasmusWL May 16, 2023
e422b64
Use `resolve extractor` when finding autobuild scripts
henrymercer May 16, 2023
2bf10dc
Extract semantic CLI version from URL when requesting specific tools
henrymercer May 16, 2023
a1be09e
Remove redundant query help version flag
henrymercer May 16, 2023
f515914
Merge pull request #1680 from github/henrymercer/handle-swift-promotion
henrymercer May 16, 2023
d439786
Merge branch 'main' into henrymercer/remove-redundant-flag
henrymercer May 16, 2023
ca6b925
Merge pull request #1681 from github/henrymercer/remove-redundant-flag
henrymercer May 16, 2023
f54f073
Merge branch 'main' into henrymercer/semver-bundles
henrymercer May 17, 2023
50931b4
Add changelog note
henrymercer May 17, 2023
a5f4123
Improve changelog note
henrymercer May 17, 2023
6cfb483
Merge pull request #1682 from github/henrymercer/semver-bundles
henrymercer May 18, 2023
317cd34
Push back semver CodeQL bundles
henrymercer May 22, 2023
1245696
Merge pull request #1687 from github/henrymercer/update-changelog-note
henrymercer May 22, 2023
8c923c0
Fix Swift PR Checks on `nightly-latest` CLI (#1696)
angelapwen May 24, 2023
570734c
Remove unnecessary conditional for Ruby autodetect (#1699)
angelapwen May 24, 2023
c3ae9dc
Update changelog for v2.3.4
invalid-email-address May 24, 2023
0d65621
Update CHANGELOG.md
angelapwen May 24, 2023
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
21 changes: 13 additions & 8 deletions .github/actions/setup-swift/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Set up Swift"
description: Sets up an appropriate Swift version if Swift is enabled via CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT.
description: Sets up an appropriate Swift version if supported on this platform.
inputs:
codeql-path:
description: Path to the CodeQL CLI executable.
Expand All @@ -9,24 +9,29 @@ runs:
steps:
- name: Get Swift version
id: get_swift_version
if: env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true'
if: runner.os != 'Windows'
shell: bash
env:
CODEQL_PATH: ${{ inputs.codeql-path }}
run: |
if [ $RUNNER_OS = "macOS" ]; then
if [[ $RUNNER_OS = "macOS" ]]; then
PLATFORM="osx64"
else # We do not run this step on Windows.
PLATFORM="linux64"
fi
SWIFT_EXTRACTOR_DIR="$("$CODEQL_PATH" resolve languages --format json | jq -r '.swift[0]')"
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/$PLATFORM/extractor" --version | awk '/version/ { print $3 }')"
# Specify 5.7.0, otherwise setup Action will default to latest minor version.
if [ $VERSION = "5.7" ]; then
VERSION="5.7.0"
if [ $SWIFT_EXTRACTOR_DIR = "null" ]; then
VERSION="null"
else
VERSION="$("$SWIFT_EXTRACTOR_DIR/tools/$PLATFORM/extractor" --version | awk '/version/ { print $3 }')"
# Specify 5.7.0, otherwise setup Action will default to latest minor version.
if [ $VERSION = "5.7" ]; then
VERSION="5.7.0"
fi
fi
echo "version=$VERSION" | tee -a $GITHUB_OUTPUT

- uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf # Please update the corresponding SHA in the CLI's CodeQL Action Integration Test.
if: env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true'
if: runner.os != 'Windows' && steps.get_swift_version.outputs.version != 'null'
with:
swift-version: "${{ steps.get_swift_version.outputs.version }}"
3 changes: 1 addition & 2 deletions .github/workflows/__analyze-ref-input.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__autobuild-action.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__config-export.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__diagnostics-export.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__export-file-baseline-information.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__extractor-ram-threads.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__go-custom-queries.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__go-tracing-autobuilder.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__go-tracing-custom-build-steps.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__go-tracing-legacy-workflow.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__init-with-registries.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__javascript-source-root.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__ml-powered-queries.yml

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

14 changes: 5 additions & 9 deletions .github/workflows/__multi-language-autodetect.yml

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

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

3 changes: 1 addition & 2 deletions .github/workflows/__packaging-config-inputs-js.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__packaging-config-js.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__packaging-inputs-js.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__remote-config.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__rubocop-multi-language.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__ruby.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__split-workflow.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__submit-sarif-failure.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__swift-custom-build.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__test-autobuild-working-dir.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__test-local-codeql.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__test-proxy.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__unset-environment.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__upload-ref-sha-input.yml

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

3 changes: 1 addition & 2 deletions .github/workflows/__with-checkout-path.yml

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

5 changes: 5 additions & 0 deletions .github/workflows/debug-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,16 @@ jobs:
with:
go-version: ^1.13.1
- uses: ./../action/init
id: init
with:
tools: ${{ steps.prepare-test.outputs.tools-url }}
debug: true
debug-artifact-name: my-debug-artifacts
debug-database-name: my-db
- uses: ./../action/.github/actions/setup-swift
if: matrix.version == 'nightly-latest'
with:
codeql-path: ${{ steps.init.outputs.codeql-path }}
- name: Build code
shell: bash
run: ./build.sh
Expand Down
Loading