Skip to content

Commit 9d67feb

Browse files
ci(release): merge 4 jobs into 2
No need to do this in as many jobs. Splitting all the github stuff from docker stuff into two jobs is enough. This still allows to conditionally enable docker jobs in contributors repos, depending on whether the relevant docker credentials are provided - but avoids using too many concurrent runners.
1 parent 6220ab3 commit 9d67feb

1 file changed

Lines changed: 8 additions & 30 deletions

File tree

.github/workflows/release.yaml

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
2020

2121

22-
prepare:
23-
name: Prepare
22+
github:
23+
name: GitHub
24+
permissions:
25+
contents: write
2426
runs-on: ubuntu-slim
2527
needs:
2628
- build
@@ -47,23 +49,7 @@ jobs:
4749
4850
echo "Relevant extract from CHANGELOG.md:"
4951
cat CHANGES.md
50-
- name: Save CHANGES.md as artifact
51-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
52-
with:
53-
name: release-changes
54-
path: CHANGES.md
55-
if-no-files-found: error
56-
5752
58-
github:
59-
name: GitHub
60-
permissions:
61-
contents: write
62-
runs-on: ubuntu-slim
63-
needs:
64-
- prepare
65-
steps:
66-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6753
- name: Download all artifacts
6854
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
6955
with:
@@ -115,14 +101,14 @@ jobs:
115101
gh release edit devel \
116102
-t devel \
117103
--verify-tag \
118-
-F artifacts/release-changes/CHANGES.md \
104+
-F CHANGES.md \
119105
--prerelease
120106
gh release upload --clobber devel release-bundle/*
121107
else
122108
gh release create "${GITHUB_REF_NAME}" \
123109
-t "${GITHUB_REF_NAME}" \
124110
--verify-tag \
125-
-F artifacts/release-changes/CHANGES.md \
111+
-F CHANGES.md \
126112
release-bundle/*
127113
fi
128114
@@ -131,7 +117,7 @@ jobs:
131117
name: Docker Hub
132118
runs-on: ubuntu-24.04-arm
133119
needs:
134-
- prepare
120+
- github
135121
if: |
136122
vars.DOCKER_REPO && vars.DOCKER_USER
137123
env:
@@ -177,16 +163,8 @@ jobs:
177163
echo "Skipping push to 'latest' tag for pre-release..."
178164
fi
179165
180-
181-
docker-description:
182-
name: Docker Hub Description
183-
runs-on: ubuntu-slim
184-
if: |
185-
vars.DOCKER_REPO && vars.DOCKER_USER &&
186-
github.ref == 'refs/tags/devel'
187-
steps:
188-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
189166
- uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
167+
name: Docker Hub Description
190168
with:
191169
username: ${{ vars.DOCKER_USER }}
192170
password: ${{ secrets.DOCKER_PASS }}

0 commit comments

Comments
 (0)