Skip to content

Commit dc915ae

Browse files
committed
Fix build
* Avoid attempt to delete main branch * Fetch tags manually actions/checkout#1467 * Auto-release
1 parent a963c21 commit dc915ae

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Diff for: .github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
git push origin websiterelease
6161
6262
- name: Delete release tag
63-
if: "always()"
63+
if: "always() && github.ref != 'refs/heads/main'"
6464
run: |
6565
git tag --delete "${GITHUB_REF_NAME}" || true
6666
git push --delete origin "${GITHUB_REF_NAME}" || true

Diff for: .github/workflows/website.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
2121
with:
2222
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
23-
fetch-tags: true
2423

2524
- name: Setup git
2625
run: |
26+
git fetch --tags
2727
git config --global user.name "Stephen Colebourne (CI)"
2828
git config --global user.email "[email protected]"
2929
@@ -67,6 +67,7 @@ jobs:
6767
git push origin main
6868
6969
- name: Delete website tag
70+
if: github.ref != 'refs/heads/main'
7071
run: |
7172
git tag --delete "${GITHUB_REF_NAME}" || true
7273
git push --delete origin "${GITHUB_REF_NAME}" || true

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@
941941
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
942942
<serverId>sonatype-joda-staging</serverId>
943943
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
944-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
944+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
945945
</configuration>
946946
</plugin>
947947
<!-- Create dist files -->

0 commit comments

Comments
 (0)