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.

Sign up for GitHub

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

Jump to bottom

fix(ci): Fix ISO upload/Changelogs Conditionals for HWE/GTS #1926

Merged
merged 2 commits into from
Nov 14, 2024
Merged

fix(ci): Fix ISO upload/Changelogs Conditionals for HWE/GTS #1926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f526843
fix(ci): Fix ISO upload/Changelogs Conditionals
m2Giles Nov 13, 2024
be8851b
fix-regex with new tags
m2Giles Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/changelogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
RETRIES = 3
RETRY_WAIT = 5
FEDORA_PATTERN = re.compile(r"\.fc\d\d")
START_PATTERN = lambda target: re.compile(rf"{target}-[0-9]+")
START_PATTERN = lambda target: re.compile(rf"{target}-\d\d\d+")

PATTERN_ADD = "\n| ✨ | {name} | | {version} |"
PATTERN_CHANGE = "\n| 🔄 | {name} | {prev} | {new} |"
Expand Down Expand Up @@ -104,9 +104,9 @@


def get_images(target: str):
if target == "latest":
if "latest" in target:
matrix = IMAGE_MATRIX_LATEST
elif target == "gts":
elif "gts" in target:
matrix = IMAGE_MATRIX_GTS
else:
matrix = IMAGE_MATRIX
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-build-iso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
overwrite: true

- name: Upload ISOs and Checksum to R2 to Bluefin Bucket
if: github.ref_name == 'main' && contains(matrix.brand_name,'bluefin')
if: github.ref_name == 'main' && contains(matrix.base_name,'bluefin')
shell: bash
env:
RCLONE_CONFIG_R2_TYPE: s3
Expand All @@ -102,7 +102,7 @@ jobs:
rclone copy $SOURCE_DIR R2:bluefin

- name: Upload ISOs and Checksum to R2 to Aurora Bucket
if: github.ref_name == 'main' && contains(matrix.brand_name,'aurora')
if: github.ref_name == 'main' && contains(matrix.base_name,'aurora')
shell: bash
env:
RCLONE_CONFIG_R2_TYPE: s3
Expand Down
Loading