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

Start of branch 3.4.x, adapt CI and build #2928

Merged
merged 1 commit into from
Feb 18, 2022
Merged

Conversation

simonbasle
Copy link
Member

No description provided.

@simonbasle simonbasle requested a review from a team as a code owner February 17, 2022 17:23
@@ -118,7 +118,7 @@ spotless {
enforceCheck false
}
else {
String spotlessBranch = "origin/main"
String spotlessBranch = "origin/3.4.x"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this will need to be reverted back to origin/main on the main branch when forward-merging

@simonbasle
Copy link
Member Author

simonbasle commented Feb 17, 2022

external associated tasks:

  • environments have been updated to allow the 3.4.x branch to produce snapshots/releases
  • ratchetFrom origin/main to be restored once forward-merged
  • bot recognizes 3.4.x as a maintenance branch with forward-merges to be made

suggested commit message:

Start of branch 3.4.x, adapt CI and build

@simonbasle simonbasle added this to the 3.4.16 milestone Feb 17, 2022
@simonbasle simonbasle added the type/chores A task not related to code (build, formatting, process, ...) label Feb 17, 2022
@simonbasle simonbasle changed the title current GA development (2020.0) now occurs on branch 3.4.x Start of branch 3.4.x, adapt CI and build Feb 18, 2022
@simonbasle simonbasle merged commit 49d2f9d into 3.4.x Feb 18, 2022
@reactorbot
Copy link

@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to main 🙇

@simonbasle simonbasle deleted the newBranchAdaptCi branch February 18, 2022 08:54
simonbasle added a commit that referenced this pull request Feb 18, 2022
Keep spotless ratchetFrom at origin/main.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/chores A task not related to code (build, formatting, process, ...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants