Skip to content

Commit 6d77a55

Browse files
committed
actions: fix release build
The previous code has a couple of issues: - it confused release name and tag name - it assigned the tag ref to the release name
1 parent a937195 commit 6d77a55

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

.github/scripts/bake-metadata.py

+17-4
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,22 @@ def get_cache_from(self, target: Target) -> List[str]:
207207

208208
@dataclass
209209
class ReleaseEvent(BaseEvent):
210-
release_name: str
210+
tag_name: str
211211
commit_hash: str
212+
prerelease: bool
213+
draft: bool
212214

213215
def version_string(self):
214-
return f"{self.release_name} {short_hash(self.commit_hash)}"
216+
return f"{self.get_stable_version()} {short_hash(self.commit_hash)}"
215217

216218
def get_stable_version(self) -> str:
217219
# stable/osrd-front:1.0-devel # 1.0 XXXX
218-
return self.release_name
220+
name = self.tag_name
221+
if self.prerelease:
222+
name = f"{name}-rc"
223+
if self.draft:
224+
name = f"{name}-draft"
225+
return name
219226

220227
def get_stable_image_namer(self) -> ImageNamer:
221228
return release_image
@@ -252,7 +259,13 @@ def parse_event(context) -> Event:
252259
return MergeGroupEvent(commit_hash, target_branch)
253260

254261
if event_name == "release":
255-
return ReleaseEvent(ref, commit_hash)
262+
release = event["release"]
263+
return ReleaseEvent(
264+
release["tag_name"],
265+
commit_hash,
266+
release["prerelease"],
267+
release["draft"],
268+
)
256269

257270
if event_name in ("workflow_dispatch", "push"):
258271
return BranchEvent(ref_name, protected, commit_hash)

.github/workflows/release.yml

+6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ jobs:
2424
GITHUB_CONTEXT: ${{ toJson(github) }}
2525
run: |
2626
set -eo pipefail
27+
echo ::group::Github context
28+
python3 -m json.tool <<< "${GITHUB_CONTEXT}"
29+
echo ::endgroup::
30+
31+
echo ::group::Bake metadata
2732
.github/scripts/bake-metadata.py | tee bake-metadata.json
33+
echo ::endgroup::
2834
2935
- name: Set up Docker Buildx
3036
uses: docker/setup-buildx-action@v3

0 commit comments

Comments
 (0)