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

Merged
merged 47 commits into from Nov 25, 2022
Merged

Merge main into releases/v2 #1395

merged 47 commits into from Nov 25, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 25, 2022

Merging 7e73ded into releases/v2

Conductor for this PR is @alexet.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
  • Merge the mergeback PR that will automatically be created once this PR is merged.
  • Merge the v1 release PR that will automatically be created once this PR is merged.

edoardopirovano and others added 30 commits November 16, 2022 15:49
This allows us to set it automatically in the workflow generator,
simplifying things and reducing the scope for error.
TRAP Caching: Re-introduce workaround for download timeout
…ment

Set testing environment for CodeQL workflow
Mergeback v2.1.33 refs/heads/releases/v2 into main
This will allow feature flags to be shared across steps in the same job,
avoiding an error we saw earlier where the init action had the flag
enabled, but the analyze step had it disabled.

This uses the runner's temp folder to cache the flags file, which will
stick around until the job completes.
The expected deprecation date of GHES 3.3 has been postponed, so v1 will
now be deprecated in January.
Co-authored-by: Henry Mercer <henry.mercer@me.com>
The version installed in the latest runner image, 5.7.1, is not yet
supported.
henrymercer and others added 17 commits November 23, 2022 10:31
…er-versions

Update supported GitHub Enterprise Server versions.
Currently only macOS supports 5.7.1
This works by moving the logic to check for toolcache bypass out of
creating the codeql instance. The logic now _may_ perform an API request
in order to check what languages are in the repository. This check is
redundant because the same call is being made later in the action when
the actual list of languages is calculated.
Update default CodeQL bundle version to 2.11.4
…o-5.7.1

Run Swift tests with Swift 5.7.1 on macOS
If a user explicitly includes java in their language inputs, always
make an api call to check for kotlin in the repo.

Also, add some suggestions from code reviews.
…in-swift

Add a way to bypass the toolcache for kotlin and swift
@alexet alexet marked this pull request as ready for review November 25, 2022 13:48
@alexet alexet requested a review from a team as a code owner November 25, 2022 13:48
@henrymercer
Copy link
Contributor

This just needs an approval to merge.

@alexet alexet merged commit 312e093 into releases/v2 Nov 25, 2022
@alexet alexet deleted the update-v2.1.34-7e73deda branch November 25, 2022 15:18
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.

None yet

7 participants