Henry Mercer
3bb6c41212
Remove an extraneous commit during the release process
...
We only need to run `git commit` after the `git merge` call if there were conflicts.
2022-05-11 10:50:13 +01:00
Andrew Eisenberg
827fd55c21
Create update-required-checks script
...
This also removes the .github/workflows/update-required-checks.yml
workflow. This script needs to be run locally by someone who has
admin privileges on the repo.
2022-05-09 14:59:16 -07:00
Andrew Eisenberg
06d4e82bd2
Add permissions block to workflow
2022-05-02 12:01:19 -07:00
Andrew Eisenberg
b71f20d70f
Add workflow to regenerate required checks
...
Update contributing guide.
Ensure this workflow runs once a week.
2022-05-02 10:15:40 -07:00
Andrew Eisenberg
a73e506617
Fix syntax error in workflow
2022-04-29 17:33:21 -07:00
Andrew Eisenberg
922dc2b976
Use the --resolve-query-specs parameter of pack download
...
This will allow the command to resolve packs with paths.
Also, use a more concise version of `tr`.
2022-04-29 10:54:01 -07:00
Andrew Eisenberg
06b15c22b1
Allow pack specifiers to include paths
...
Also, this cleans up our pack-related integration tests.
We are now testing with the most recent CLIs.
2022-04-28 17:14:30 -07:00
Henry Mercer
2b8fdb3f2e
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
2022-04-25 17:02:03 +01:00
Henry Mercer
074853a9a2
Suggest resolving conflicts by adding new commits vs amending the merge commit
...
This gives us slightly messier git history, but more importantly makes
reviewing substantially easier.
2022-04-25 16:37:32 +01:00
Henry Mercer
5b5ed44ab7
Add a PR check to check for conflict markers
...
This check is primarily intended to validate that any merge conflicts in
the v2 -> v1 backport PR are fixed before the PR is merged.
2022-04-14 20:05:42 +01:00
Henry Mercer
9daf1de73c
Update references to release branches
...
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
2022-04-14 17:48:46 +01:00
Henry Mercer
bce749b10f
Improve consistency of variable references in Bash
2022-04-14 17:48:46 +01:00
Henry Mercer
fce4a01cd7
Update the major version tag within the release process
2022-04-14 17:48:46 +01:00
Henry Mercer
bac9320f4f
Update description of "Tag release and merge back" workflow
2022-04-14 17:48:46 +01:00
Henry Mercer
f6312f1322
Commit any conflicts during v1 backport to simplify release process
...
The process of creating the v1 release can run into merge conflicts. We
commit the unresolved conflicts so a maintainer can easily resolve them
(vs erroring and requiring maintainers to reconstruct the release
manually).
2022-04-14 16:08:38 +01:00
Chuan-kai Lin
6f174084dd
Add autobuild workind-directory test
2022-04-08 15:18:11 -07:00
Henry Mercer
dc0338e493
Use latest major version of actions/upload-artifact
2022-03-31 10:11:33 +01:00
Henry Mercer
57096fe795
Add a PR check to validate that ML-powered queries are run correctly
2022-03-31 10:11:30 +01:00
Henry Mercer
ea751a9fae
Update other Actions from v2 to v3
2022-03-30 19:46:09 +01:00
Henry Mercer
a2949f47b3
Update actions/checkout from v2 to v3
2022-03-30 19:46:09 +01:00
Edoardo Pirovano
a9095cefc9
Avoid failure if @types/node is already 12.12
2022-03-30 16:58:25 +01:00
Henry Mercer
381ea36211
Delete unused workflows
2022-03-30 16:00:52 +01:00
Henry Mercer
e769c2dd6e
Run all PR checks on v2 branch
2022-03-30 15:59:09 +01:00
Edoardo Pirovano
a4da970395
Run workflow also on v2 branch
2022-03-30 11:47:41 +01:00
Edoardo Pirovano
1d58cc1f27
Fix typos in release workflow
2022-03-30 10:28:34 +01:00
Henry Mercer
282b607642
Update changelog rewriting step to match v2+ only release notes
2022-03-29 16:10:02 +01:00
Henry Mercer
2f4dd4bb41
Use git add --all .
2022-03-29 13:27:03 +01:00
Henry Mercer
9e403590f4
Improve code comments
2022-03-28 18:02:19 +01:00
Henry Mercer
45b96c3de6
Add PR check to validate compatibility with Node 12
2022-03-28 16:40:01 +01:00
Henry Mercer
9a709c116e
Add changelog note
2022-03-28 16:39:46 +01:00
Henry Mercer
839aa81918
Merge branch 'main' into henrymercer/update-release-process
2022-03-25 19:11:59 +00:00
Andrew Eisenberg
88db5e75ec
Merge branch 'main' into aeisenberg/checkout-path-commitoid
2022-03-25 10:31:47 -07:00
Andrew Eisenberg
d068f5372a
Fix failing tests
2022-03-25 10:00:47 -07:00
Henry Mercer
d0bd80897c
Expose a more restrictive interface to the release script
...
Give the release script modes rather
than source and target branches
2022-03-25 15:17:17 +00:00
Henry Mercer
bed132dae4
Use a more restrictive sed pattern
2022-03-25 13:40:41 +00:00
Henry Mercer
9d26fe0cb3
Use source branch and target branch names consistently
2022-03-25 12:55:00 +00:00
Henry Mercer
33599909af
Avoid conflicts by reverting 1.x version num commit from last v1 release
2022-03-24 18:18:45 +00:00
Henry Mercer
f143182488
Add "Update dependencies" label to v1 release PR
2022-03-24 18:18:45 +00:00
Henry Mercer
0b037b4fcb
Add merging the v1 release PR to the checklist
2022-03-24 18:18:45 +00:00
Henry Mercer
1668e0a2bf
Only mention merging the mergeback PR in the checklist when relevant
2022-03-24 18:18:45 +00:00
Henry Mercer
bd4757cd6b
Update the changelog and version number in a single commit
2022-03-24 18:18:45 +00:00
Henry Mercer
5fb01dd153
Avoid commits with duplicate names during v2 to v1 backport
2022-03-24 18:18:45 +00:00
Henry Mercer
b8f3a377bf
Fix exception when there are no commits to merge
2022-03-24 18:18:45 +00:00
Henry Mercer
4b465cb3ce
Dump environment and GitHub context
2022-03-24 18:18:45 +00:00
Henry Mercer
d76b18254a
Add functionality for v2 -> v1 backports
2022-03-24 18:18:45 +00:00
Henry Mercer
33f749f1c9
Set up main -> v2, v2 -> v1, and v2 -> main merges
2022-03-24 18:18:45 +00:00
Henry Mercer
ccda44cac5
Handle missing author information when generating changelog
2022-03-24 18:18:45 +00:00
Henry Mercer
81827d3fc6
Use the person triggering the release workflow as the conductor
2022-03-24 18:18:45 +00:00
Henry Mercer
b386fd4443
Parameterize release branch workflow over source and target branches
2022-03-24 18:18:45 +00:00
Henry Mercer
2a7a517ea5
Remove unused repository_dispatch trigger
2022-03-24 18:18:45 +00:00
