mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-12 13:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing' into unstable

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-10-25 15:50:38 -07:00
commit e4fdd6b352
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View File

@ -277,6 +277,7 @@ jobs:
ref: 'raw-img' ref: 'raw-img'
prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}' prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}'
version: '${{ steps.generate-version.outputs.tag }}' version: '${{ steps.generate-version.outputs.tag }}'
skip_compression: 1
labels: | labels: |
io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png
io.artifacthub.package.readme-url=https://docs.bazzite.gg io.artifacthub.package.readme-url=https://docs.bazzite.gg
@ -321,9 +322,6 @@ jobs:
BUILD_TAGS+=("${FEDORA_VERSION}-unstable") BUILD_TAGS+=("${FEDORA_VERSION}-unstable")
BUILD_TAGS+=("unstable-${FEDORA_VERSION}") # flip ver to be last BUILD_TAGS+=("unstable-${FEDORA_VERSION}") # flip ver to be last
# Per upstream ver
BUILD_TAGS+=("unstable-${UPSTREAM_TAG}")
if [ -n "$LATEST" ]; then if [ -n "$LATEST" ]; then
BUILD_TAGS+=("unstable") BUILD_TAGS+=("unstable")
fi fi
@ -332,16 +330,12 @@ jobs:
BUILD_TAGS+=("${FEDORA_VERSION}-testing") BUILD_TAGS+=("${FEDORA_VERSION}-testing")
BUILD_TAGS+=("testing-${FEDORA_VERSION}") # flip ver to be last BUILD_TAGS+=("testing-${FEDORA_VERSION}") # flip ver to be last
# Per upstream ver
BUILD_TAGS+=("testing-${UPSTREAM_TAG}")
if [ -n "$LATEST" ]; then if [ -n "$LATEST" ]; then
BUILD_TAGS+=("testing") BUILD_TAGS+=("testing")
fi fi
else else
BUILD_TAGS+=("${FEDORA_VERSION}") BUILD_TAGS+=("${FEDORA_VERSION}")
BUILD_TAGS+=("${UPSTREAM_TAG}") BUILD_TAGS+=("stable-${VERSION_TAG}")
BUILD_TAGS+=("stable-${UPSTREAM_TAG}")
# Per fedora version # Per fedora version
BUILD_TAGS+=("${FEDORA_VERSION}-stable") BUILD_TAGS+=("${FEDORA_VERSION}-stable")

10
.github/workflows/changelog.py vendored
View File

@ -383,15 +383,19 @@ def main():
parser.add_argument("--handwritten", help="Handwritten changelog") parser.add_argument("--handwritten", help="Handwritten changelog")
args = parser.parse_args() args = parser.parse_args()
manifests = get_manifests(args.target) # Remove refs/tags, refs/heads, refs/remotes e.g.
prev, curr = get_tags(args.target, manifests) # Tags cannot include / anyway.
target = args.target.split('/')[-1]
manifests = get_manifests(target)
prev, curr = get_tags(target, manifests)
print(f"Previous tag: {prev}") print(f"Previous tag: {prev}")
print(f" Current tag: {curr}") print(f" Current tag: {curr}")
prev_manifests = get_manifests(prev) prev_manifests = get_manifests(prev)
title, changelog = generate_changelog( title, changelog = generate_changelog(
args.handwritten, args.handwritten,
args.target, target,
args.pretty, args.pretty,
args.workdir, args.workdir,
prev_manifests, prev_manifests,