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

Fix the mergeback workflow #534

Merged
merged 41 commits into from
Jun 1, 2021
Merged

Fix the mergeback workflow #534

merged 41 commits into from
Jun 1, 2021

Conversation

aeisenberg
Copy link
Contributor

@aeisenberg aeisenberg commented May 31, 2021

And manually mergeback v1 into main.

Needed to do a few fixes here:

  • Fix the logic in post-release-mergeback.yml workflow
  • Unshallow before pushing a tag
  • Fix the version script so that newlines are correctly stripped to keep removeNPMAbsolutePaths happy
  • Manually updated the changelog.

Merge / deployment checklist

  • Confirm this change is backwards compatible with existing workflows.
  • Confirm the readme has been updated if necessary.
  • Confirm the changelog has been updated if necessary.

robertbrignull and others added 30 commits December 7, 2020 09:51
…t-pip-v1

Prevent accidental analysis of the `get-pip.py` script. [v1 cherry-pick]
…s: latest`

Always test against both the default and latest CodeQL bundle.

This improves test coverage shortly after a CodeQL bundle release, where the latest bundle
may not yet be built into the Actions VM image as the default bundle.

It also saves a manual step during bundle release testing,
since we no longer need to temporarily change the PR checks to `tools: latest`.

There is some redundancy when the latest bundle is the same as the default bundle on the VM image,
but this can be considered a test for the `tools: latest` configuration.
Create a prerequisite job that runs the init step twice, with `tools: null` and `tools: latest`.
Use the outputs of these steps to compare the two CodeQL versions.
Pass the list of distinct tool versions for the integration tests to use in their matrix strategy.
This avoids redundant test jobs when the default and latest bundles are actually the same version of CodeQL.

`~` is accepted by JSON but not by the Actions context language, so we use `null` to indicate the default version.
Create a prerequisite job that runs the init step twice, with `tools: null` and `tools: latest`.
Use the outputs of these steps to compare the two CodeQL versions.
Pass the list of distinct tool versions for the analysis job to matrix over.
This lets us test the analysis against both versions, while avoiding duplication
when they are actually the same version.
This allows users to specify a different token for retrieving the
codeql config from a different repository.

Fixes github/advanced-security-field#185
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.

8 participants