Merge releases/v2 into releases/v1 #1155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v2.1.16 refs/heads/releases/v2 into main
Co-authored-by: Henry Mercer <[email protected]>
Don't crash if we are unable to get a response from the feature-flag endpoint.
Update bundle to 2.10.1
Bumps [terser](https://github.com/terser/terser) from 5.7.1 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…erser-5.14.2 Bump terser from 5.7.1 to 5.14.2 in /runner
Without this, the tracer will not be injected on MacOS, as we need the runner to circumvent SIP. Also add a test that tests the autobuild-action to exercise this code path.
Add the missing `$CODEQL_RUNNER` prefix to the autobuild command line. This intermediate process works around System Integrity Protection, allowing the tracer to start the C# extractor for the dotnet builds within the autobuild process. The test used to pass without this because the legacy CLR tracer bypassed SIP while dotnet 5 was used on the Actions virtual environment. Now that the virtual environment uses dotnet 6, the CLR tracer no longer works, and we need to explicitly work around SIP. This test will eventually be replaced by an internal integration test for the equivalent functionality in the CLI. For now, this change makes the test continue to pass.
Ensure that this succeeds even if the legacy CLR tracer is not enabled. The combination of the regular tracer and the SIP workaround within Actions should be sufficient for this to pass.
We do not need to prefix `$CODEQL_RUNNER` here on macOS to bypass SIP, because we assume that the `init` step exported `DYLD_INSERT_LIBRARIES` into the environment, which activates the Actions workaround for SIP. See actions/runner#416.
This test workflow does not source the environment from the init step, so we need to manually read in the variable.
autobuild: Update tests for C# on macOS
Merge main into releases/v2
This reverts commit 0b90ea8.
This reverts commit ea16f0f.
github-actions
bot
added
the
Update dependencies
adityasharad
approved these changes
Jul 28, 2022
github-actions
bot
removed
the
Update dependencies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging 0c670bb into releases/v1
Conductor for this PR is @adityasharad
Contains the following pull requests:
Please review the following: