mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-12 04:14:06 +00:00
Merge branch 'testing' into unstable
This commit is contained in:
commit
e4fdd6b352
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
@ -277,6 +277,7 @@ jobs:
|
||||
ref: 'raw-img'
|
||||
prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}'
|
||||
version: '${{ steps.generate-version.outputs.tag }}'
|
||||
skip_compression: 1
|
||||
labels: |
|
||||
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
|
||||
@ -321,9 +322,6 @@ jobs:
|
||||
BUILD_TAGS+=("${FEDORA_VERSION}-unstable")
|
||||
BUILD_TAGS+=("unstable-${FEDORA_VERSION}") # flip ver to be last
|
||||
|
||||
# Per upstream ver
|
||||
BUILD_TAGS+=("unstable-${UPSTREAM_TAG}")
|
||||
|
||||
if [ -n "$LATEST" ]; then
|
||||
BUILD_TAGS+=("unstable")
|
||||
fi
|
||||
@ -332,16 +330,12 @@ jobs:
|
||||
BUILD_TAGS+=("${FEDORA_VERSION}-testing")
|
||||
BUILD_TAGS+=("testing-${FEDORA_VERSION}") # flip ver to be last
|
||||
|
||||
# Per upstream ver
|
||||
BUILD_TAGS+=("testing-${UPSTREAM_TAG}")
|
||||
|
||||
if [ -n "$LATEST" ]; then
|
||||
BUILD_TAGS+=("testing")
|
||||
fi
|
||||
else
|
||||
BUILD_TAGS+=("${FEDORA_VERSION}")
|
||||
BUILD_TAGS+=("${UPSTREAM_TAG}")
|
||||
BUILD_TAGS+=("stable-${UPSTREAM_TAG}")
|
||||
BUILD_TAGS+=("stable-${VERSION_TAG}")
|
||||
|
||||
# Per fedora version
|
||||
BUILD_TAGS+=("${FEDORA_VERSION}-stable")
|
||||
|
10
.github/workflows/changelog.py
vendored
10
.github/workflows/changelog.py
vendored
@ -383,15 +383,19 @@ def main():
|
||||
parser.add_argument("--handwritten", help="Handwritten changelog")
|
||||
args = parser.parse_args()
|
||||
|
||||
manifests = get_manifests(args.target)
|
||||
prev, curr = get_tags(args.target, manifests)
|
||||
# Remove refs/tags, refs/heads, refs/remotes e.g.
|
||||
# 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" Current tag: {curr}")
|
||||
|
||||
prev_manifests = get_manifests(prev)
|
||||
title, changelog = generate_changelog(
|
||||
args.handwritten,
|
||||
args.target,
|
||||
target,
|
||||
args.pretty,
|
||||
args.workdir,
|
||||
prev_manifests,
|
||||
|
Loading…
x
Reference in New Issue
Block a user