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 #1153

Merged
merged 23 commits into from
Jul 28, 2022
Merged

Merge main into releases/v2 #1153

merged 23 commits into from
Jul 28, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 28, 2022

Merging bbc2e70 into releases/v2

Conductor for this PR is @adityasharad

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the releases/v2 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.
  • The v1 release PR is merged after this PR is merged.

github-actions[bot] and others added 23 commits July 13, 2022 11:26
Mergeback v2.1.16 refs/heads/releases/v2 into main
Co-authored-by: Henry Mercer <henrymercer@github.com>
Don't crash if we are unable to get a response from the feature-flag endpoint.
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] <support@github.com>
…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
@adityasharad adityasharad marked this pull request as ready for review July 28, 2022 17:05
@adityasharad adityasharad requested a review from a team as a code owner July 28, 2022 17:05
@adityasharad adityasharad mentioned this pull request Jul 28, 2022
6 tasks
@adityasharad adityasharad merged commit 0c670bb into releases/v2 Jul 28, 2022
@adityasharad adityasharad deleted the update-v2.1.17-bbc2e701 branch July 28, 2022 17:45
@github-actions github-actions bot mentioned this pull request Jul 28, 2022
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants