Bump patch versions automatically on master #2870

ehildenb · 2022-09-10T17:28:03Z

Fixes: #1928

Part of: #2869

Bump patch versions automatically on PRs. It's set up to have the following logic (to allow manually setting version, and automatically bumping it):
- If the major and minor version identifiers are different than the merge base (eg. bump from 5.3.X => 5.4.0), do not bump the patch number.
- If the major and minor version identifiers are the same as the merge base, then automatically bump the patch number to be one more than the merge base patch number.
- Do version string substitution through the repository.
- If there are any changes in the repo, push them to the current branch.
Set up concurrency groups on all github workflows, so that old jobs are appropriately cancelled (otherwise we run into GitHub public runner limit of 15 concurrent at a time pretty quickly).
Removes the push: ... specifier for update.yml job. Should this remain @goodlyrottenapple? It seems unnecessary.

TODO:

Enable this new status check as required on CI.

ehildenb · 2022-09-10T18:15:55Z

It's working here

ehildenb · 2022-09-10T18:20:17Z

Note that I had to make this change to our organization secret:

I think it should be OK, because secrets are still not shared with PRs run from forks.

This reverts commit 7ce15f4.

ehildenb · 2022-09-10T18:24:24Z

Appears to be working properly:

… master branch

ehildenb · 2022-09-12T17:20:47Z

Your understanding is not quite correct. CI will do this only the minimum number of times needed (not every time you push). That will be:

If master branch is updated, and then this branch is pushed to, CI will now bump the version here to the next version after master branch. You will have to git pull.
When you first open the PR, CI will automatically push the new version to your branch (within 30s).

It's always safe to resolve the merge conflict with git checkout --ours -- package/version or git checkout --theirs -- package/version, CI will always make sure the version identifier is set correctly afterwards either way. Also, it should always be possible to do git fetch origin ; git rebase origin/MYBRANCH with no merge conflicts, which is a pretty painless process.

The wins are that we have an accurate version number no matter what, and a simplified release process, and better ability to do semantic versioning.

radumereuta · 2022-09-12T17:55:55Z

Are you sure you still want to update to 5.4.0?
It will make the changelog a bit weird.

ehildenb · 2022-09-12T18:00:33Z

It's the easiest way to make sure we have version number continuity. I could also choose 5.3.202, if we know this one will be merged next.

ehildenb · 2022-09-12T18:00:55Z

But already last night when I was trying, it would have been 5.3.199, so who knows?

radumereuta · 2022-09-12T18:01:57Z

You're right. Leave it as v5.4. I will add a note in the changelog.

radumereuta · 2022-09-12T18:15:55Z

Are you sure we're still running all workflows we intend?
I'm counting 10 GH workflows + 1 Jenkins before
and 4 GH workflows + 1 Jenkins on this branch.

ehildenb · 2022-09-12T18:18:35Z

Where did you get 10 GH workflows? You can see in the PR that I didn't change any of the other workflows other than adding the concurrency throttle.

F-WRunTime · 2022-09-12T18:21:57Z

I'm just counting 4 GH workflows and 1 Jenkins

radumereuta · 2022-09-12T18:28:51Z

Look at other PRs. #2873 which doesn't have these changes has 8+1 (sorry, not 10)

ehildenb · 2022-09-12T19:00:26Z

I see 2 there triggered by push events, which this PR took care of.

ehildenb · 2022-09-12T21:39:37Z

I wonder why these checks are not required. I think I've identified the problems though:

Tests run on the other PR:

Test / Nix (ubuntu-latest) (pull_request) Successful in 8m
Update / Nix: Maven (pull_request) Successful in 7m
Test / Nix (macos-11) (pull_request) Successful in 20m
Update / Nix flake sumbodule sync (pull_request) Successful in 52s
continuous-integration/jenkins/pr-head — This commit looks good
 
Update / Nix: Maven (push) Successful in 9m
Update / Nix flake sumbodule sync (push) Successful in 43s


Test / Nix flake (ubuntu-latest) (pull_request) Successful in 5m
Test / Nix flake (macos-11) (pull_request) Successful in 11m

Tests run on this PR (before last commit):

Test / Nix (ubuntu-latest) (pull_request) Successful in 14m
Update / Nix: Maven (pull_request) Successful in 7m
Test / Nix (macos-11) (pull_request) Successful in 20m
Update / Nix flake sumbodule sync (pull_request) Successful in 42s
continuous-integration/jenkins/pr-head — This commit looks good

The tests in the first block on the other PR are run here. The tests in the second block are because I disabled push event handling on this PR for Nix: Maven and Nix: submodule sync. For some reason we were running this job doubly for pushes and pull-request events. The third block I suspect is because there was a stage name clash, and github's interface is not handling it correctly. Indeed, the output now contains all 7 entries (6 github runners, and 1 Jenkins):

Test / Nix (ubuntu-latest) (pull_request) In progress — This check has started...
Test Nix Flake / Nix flake (ubuntu-latest) (pull_request) In progress — This check has started...
Update / Nix: Maven (pull_request) In progress — This check has started...
Test / Nix (macos-11) (pull_request) In progress — This check has started...
Test Nix Flake / Nix flake (macos-11) (pull_request) In progress — This check has started...
Update / Nix flake sumbodule sync (pull_request) Successful in 42s
continuous-integration/jenkins/pr-head Pending — This commit is being built

ehildenb · 2022-09-12T21:40:46Z

We generally expect every test to pass here right? If so, we should enable this list of tests as required.

radumereuta · 2022-09-12T22:08:12Z

We generally expect every test to pass here right? If so, we should enable this list of tests as required.

We might need to doublecheck with @goodlyrottenapple on this.

dwightguth · 2022-09-12T22:51:23Z

.github/workflows/update.yml

@@ -1,9 +1,10 @@
 name: 'Update'
 on:
  pull_request:
-  push:
-    branches-ignore:


Why is this changed?

I'm not sure why it was like this in the first place, but basically it resulted in us running CI double on each pull request, once for the branch trigger and once for the pull_request trigger. @goodlyrottenapple may know why we were doing this before, I suspect it was so that someone could debug this workflow in the past without opening a PR, but I don't know.

Either way, should not need to run it twice for every branch.

ehildenb · 2022-09-13T00:05:20Z

I'm going to merge and then require these extra status checks.

This reverts commit 7763a99.

…untimeverification#2263) * haskell-backend/src/main/native/haskell-backend: e0fedde3 - kore-0.55.0.0 (runtimeverification#2873) * haskell-backend/src/main/native/haskell-backend: 689b15b8 - Update to latest NixOS (runtimeverification#2870)

ehildenb and others added 20 commits September 10, 2022 17:27

.github/workflows/update: bump patch version automatically on PRs

ff0ddc4

.github/update: switch to self-hosted for github PAT access

d710adb

.github/update: dont double-run job

0b77027

.github/update: try without JENKINS_GITHUB_PAT secret

729ae64

.github/update: try again

c2a90fc

.github/update: fetch before bump

96c7834

.github/update: focus fetch

e3bb90d

.github/update: rework workflow for bumping patch version

1a2a572

.github/update: run on public runners

31babc7

.github/workflows/update: set commiter information

df39c8e

!!! .github/update: debugging

6da5fc6

.github/update: another try

1fb9796

.github/update: try git pull first

8fedcd2

.github/update: more specific fetch

5eea390

.github/update: cancel in progress jobs

716a1af

.github/update: fetch needed refs, checkout, pull

260e11a

!!! .github/update: debugging

cf41377

.github/{test-flake, test}: make sure old jobs are cancelled

7e4a638

.github/update: invert if statement

af2304e

Set Version: 5.3.1

7ce15f4

ehildenb mentioned this pull request Sep 10, 2022

Downstream Testing and Versioning #2869

Open

14 tasks

ehildenb and others added 4 commits September 10, 2022 18:21

.github/update: run using Jenkins PAT instead so pushes trigger reruns

d97a5d4

Revert "Set Version: 5.3.1"

960281e

This reverts commit 7ce15f4.

.github/workflows: split into two files, rename

bd9aa09

Set Version: 5.3.1

97e6ce8

ehildenb added 2 commits September 10, 2022 18:26

Jenkinsfile: remove intermediate master job, cut releases directly on…

38ca4a3

… master branch

Jenkinsfile: formatting

0bbf42c

.github/bump-version: run version bumper on master

4c0bfbb

ehildenb added 2 commits September 12, 2022 17:58

.github/bump-version: adjust to be a master job

9448266

Merge remote-tracking branch 'upstream/master' into bump-patch

f4a0cbf

F-WRunTime approved these changes Sep 12, 2022

View reviewed changes

package/version.sh: check entire version string, not just major minor

f8a9b39

.github/test-flake: rename github workflow

42ef0ef

ehildenb changed the title ~~Bump patch versions automatically on PRs~~ Bump patch versions automatically on master Sep 12, 2022

dwightguth reviewed Sep 12, 2022

View reviewed changes

dwightguth approved these changes Sep 12, 2022

View reviewed changes

Merge branch 'master' into bump-patch

0d3e679

ehildenb added the automerge label Sep 13, 2022

rv-jenkins merged commit 7763a99 into master Sep 13, 2022

rv-jenkins deleted the bump-patch branch September 13, 2022 04:17

ehildenb added a commit that referenced this pull request Sep 13, 2022

Revert "Bump patch versions automatically on master (#2870)"

e7e0339

This reverts commit 7763a99.

ehildenb mentioned this pull request Sep 13, 2022

Bump patch version automatically on master branch #2876

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump patch versions automatically on master #2870

Bump patch versions automatically on master #2870

ehildenb commented Sep 10, 2022 •

edited

Loading

ehildenb commented Sep 10, 2022

ehildenb commented Sep 10, 2022

ehildenb commented Sep 10, 2022

ehildenb commented Sep 12, 2022 •

edited

Loading

radumereuta commented Sep 12, 2022 •

edited

Loading

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

radumereuta commented Sep 12, 2022

radumereuta commented Sep 12, 2022

ehildenb commented Sep 12, 2022 •

edited

Loading

F-WRunTime commented Sep 12, 2022

radumereuta commented Sep 12, 2022

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

radumereuta commented Sep 12, 2022

dwightguth Sep 12, 2022

ehildenb Sep 13, 2022

ehildenb commented Sep 13, 2022

Bump patch versions automatically on master #2870

Bump patch versions automatically on master #2870

Conversation

ehildenb commented Sep 10, 2022 • edited Loading

ehildenb commented Sep 10, 2022

ehildenb commented Sep 10, 2022

ehildenb commented Sep 10, 2022

ehildenb commented Sep 12, 2022 • edited Loading

radumereuta commented Sep 12, 2022 • edited Loading

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

radumereuta commented Sep 12, 2022

radumereuta commented Sep 12, 2022

ehildenb commented Sep 12, 2022 • edited Loading

F-WRunTime commented Sep 12, 2022

radumereuta commented Sep 12, 2022

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

ehildenb commented Sep 12, 2022

radumereuta commented Sep 12, 2022

dwightguth Sep 12, 2022

Choose a reason for hiding this comment

ehildenb Sep 13, 2022

Choose a reason for hiding this comment

ehildenb commented Sep 13, 2022

ehildenb commented Sep 10, 2022 •

edited

Loading

ehildenb commented Sep 12, 2022 •

edited

Loading

radumereuta commented Sep 12, 2022 •

edited

Loading

ehildenb commented Sep 12, 2022 •

edited

Loading