Skip to content

Commit 6d55944

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template'
2 parents e31ae54 + 8de8501 commit 6d55944

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2525

2626
- name: Publish to OSSRH
27-
run: ../mvnw -B deploy -Possrh
27+
run: ../mvnw -B deploy -Possrh -DskipTests
2828
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
2929
env:
3030
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}

CONTRIBUTING.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,31 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
5858
When the release is finished do the following:
5959
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
6060
* Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there
61+
62+
### Release failures
63+
64+
There are 2 modes of release failure:
65+
1. The remote server was e.g. down and non of the artifacts got published
66+
2. There was a build failure during release and only parts of the artifacts got released
67+
68+
In case 1 we can re-release the existing version,<br/>in case 2 we have to release a new version when we can't get the artifacts deleted (as is the case with Maven Central)
69+
70+
#### How-to: Re-Releasing an existing version
71+
72+
1. Delete the release on GitHub
73+
2. Delete the release Git tag from the repo (locally and remote!)
74+
3. Delete the ``master``-Branch and re-create it from the ``develop`` branch (or reset it to the state before the release-workflow commits have been done)
75+
* This requires __temporarily__ removing the branch protection
76+
* Once this was done a new release is triggered immediately!
77+
78+
#### How-to: Releasing a new version
79+
80+
1. Merge the ``master`` branch back into ``develop`` (or another temporary branch)
81+
2. Make sure all master branch versions are prepared for a new release<br/>e.g. if the broken release was ``1.0.0`` the version should now be at ``1.0.1-SNAPSHOT`` - the ``SNAPSHOT`` is important for the workflow!
82+
3. Mark the broken release as broken e.g. inside the Changelog, GitHub Release page, etc.<br/>
83+
You can use something like this:
84+
```
85+
> [!WARNING]
86+
> This release is broken as my cat accidentally clicked the abort button during the process
87+
```
88+
4. Merge the changes back into the ``master`` branch to trigger a new release

0 commit comments

Comments
 (0)