-
Notifications
You must be signed in to change notification settings - Fork 376
Merge v2 into v1 #1006
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
Merged
Merged
Merge v2 into v1 #1006
Changes from 8 commits
Commits
Show all changes
85 commits
Select commit
Hold shift + click to select a range
a92e877
Use the `checkout_path` for getting the commit oid
aeisenberg 5c2600e
Merge branch 'main' into aeisenberg/checkout-path-commitoid
aeisenberg 76c3e91
Bump timeout to 45 minutes
aeisenberg 1457c16
Update changelog and version after v1.1.5
invalid-email-address ac7bd44
1.1.6
invalid-email-address 34905f6
Update checked-in dependencies
invalid-email-address d0ee2b4
Merge pull request #983 from github/mergeback/v1.1.5-to-main-88347664
cklin f60bb5c
Include CodeQL CLI and action versions in status reports
cklin 3886398
Merge pull request #987 from cklin/report-versions
cklin 243ebf6
Update supported GitHub Enterprise Server versions.
web-flow 0a71301
refactor: replace deprecated String.prototype.substr()
CommanderRoot f71aeef
Merge pull request #988 from CommanderRoot/refactor/rm-deprecated-substr
henrymercer c592f89
Merge branch 'main' into update-supported-enterprise-server-versions
henrymercer 1d81ec4
Merge pull request #984 from github/update-supported-enterprise-serve…
henrymercer 6de8537
Update README now build tracing is compatible with Windows 2022
henrymercer 5d72058
Merge branch 'main' into aeisenberg/timeout-45-min
henrymercer 81bfc28
Merge pull request #989 from github/henrymercer/update-readme
henrymercer c3010cb
Status reporting: fix codeql_version field name
cklin c9973ef
Merge pull request #992 from cklin/fix-codeql-version-field
cklin 686c3a3
Merge branch 'main' into aeisenberg/timeout-45-min
aeisenberg b887a2c
Merge pull request #976 from aeisenberg/aeisenberg/timeout-45-min
aeisenberg fb22523
Bump minimist from 1.2.5 to 1.2.6
dependabot[bot] ca5ed24
Update checked-in dependencies
invalid-email-address 2a7a517
Remove unused `repository_dispatch` trigger
henrymercer b386fd4
Parameterize release branch workflow over source and target branches
henrymercer 81827d3
Use the person triggering the release workflow as the conductor
henrymercer ccda44c
Handle missing author information when generating changelog
henrymercer 33f749f
Set up `main -> v2`, `v2 -> v1`, and `v2 -> main` merges
henrymercer d76b182
Add functionality for `v2 -> v1` backports
henrymercer 4b465cb
Dump environment and GitHub context
henrymercer b8f3a37
Fix exception when there are no commits to merge
henrymercer 124e7d9
Stop versioning the runner
henrymercer 5fb01dd
Avoid commits with duplicate names during v2 to v1 backport
henrymercer bd4757c
Update the changelog and version number in a single commit
henrymercer 1668e0a
Only mention merging the mergeback PR in the checklist when relevant
henrymercer 0b037b4
Add merging the v1 release PR to the checklist
henrymercer f143182
Add "Update dependencies" label to v1 release PR
henrymercer 3359990
Avoid conflicts by reverting 1.x version num commit from last v1 release
henrymercer da7944b
Update release process doc
henrymercer df16470
Merge pull request #993 from github/dependabot/npm_and_yarn/minimist-…
henrymercer 85cfdb2
Don't download packs when it isn't needed
edoardopirovano 6e57bba
Merge pull request #998 from github/edoardo/no-download-pack
edoardopirovano 9d26fe0
Use source branch and target branch names consistently
henrymercer bed132d
Use a more restrictive `sed` pattern
henrymercer d0bd808
Expose a more restrictive interface to the release script
henrymercer f784647
Merge branch 'main' into henrymercer/update-release-process
henrymercer 044f112
Update branch protection instructions
henrymercer d068f53
Fix failing tests
aeisenberg 88db5e7
Merge branch 'main' into aeisenberg/checkout-path-commitoid
aeisenberg 6d1f0a0
Merge pull request #956 from github/aeisenberg/checkout-path-commitoid
aeisenberg 839aa81
Merge branch 'main' into henrymercer/update-release-process
henrymercer 4d6e9c0
Merge pull request #995 from github/henrymercer/update-release-process
henrymercer 077ec09
#996: Fix python_setup/install_tool.sh
cdivitotawela d625a00
Start running ATM queries again
edoardopirovano 3d23aad
Use Node.js v16 in all Actions
henrymercer b949e49
Upgrade Node type definitions
henrymercer 43c9f26
Bump version to 2.1.6
henrymercer 9a709c1
Add changelog note
henrymercer 45b96c3
Add PR check to validate compatibility with Node 12
henrymercer 9e40359
Improve code comments
henrymercer 0ed0799
Merge pull request #999 from github/edoardo/reenable-atm
edoardopirovano 63b2636
Merge branch 'main' into python2-fix
RasmusWL 01c7223
Add v2 only prefix to changelog note
henrymercer c22162c
Merge branch 'main' into henrymercer/bump-node-js-to-v16
henrymercer fdc2a90
Merge pull request #997 from cdivitotawela/python2-fix
edoardopirovano eea7cf1
Merge branch 'main' into henrymercer/bump-node-js-to-v16
henrymercer 8237e85
Merge pull request #1000 from github/henrymercer/bump-node-js-to-v16
henrymercer 2f4dd4b
Use `git add --all .`
henrymercer 73ba7ff
Merge branch 'main' into henrymercer/pr-check-validate-node-12-build
henrymercer f0e2f3c
Merge pull request #1001 from github/henrymercer/pr-check-validate-no…
henrymercer 282b607
Update changelog rewriting step to match v2+ only release notes
henrymercer af34c6d
Merge pull request #1002 from github/henrymercer/update-changelog-rew…
henrymercer f1060fb
Bump default CodeQL version to 2.8.4
edoardopirovano d8576e3
Merge pull request #990 from github/edoardo/2.8.4-bump
edoardopirovano 1d58cc1
Fix typos in release workflow
edoardopirovano bfe9e81
Merge pull request #1003 from github/edoardo/fix-workflow
edoardopirovano 8833977
Update changelog for v2.1.6
invalid-email-address 34a1681
Fix location of changelog entry
edoardopirovano a4da970
Run workflow also on `v2` branch
edoardopirovano 28eead2
Merge pull request #1004 from github/update-v2.1.6-bfe9e810
edoardopirovano 03a275b
Update version and changelog for v1.1.6
invalid-email-address 75743c9
Update checked-in dependencies
invalid-email-address b45efc9
Revert "Use Node.js v16 in all Actions"
edoardopirovano f83be76
Revert "Upgrade Node type definitions"
edoardopirovano 9da34a6
Avoid failure if `@types/node` is already 12.12
edoardopirovano File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Empty file.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.