Skip to content

Commit 6963e02

Browse files
authored
Merge pull request #58 from ublue-os/main
[pull] main from ublue-os:main
2 parents b9f83cc + 1596901 commit 6963e02

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.github/workflows/build_iso.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
workflow_dispatch:
55
workflow_call:
66

7+
env:
8+
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
9+
710
concurrency:
811
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-iso
912
cancel-in-progress: true
@@ -73,12 +76,19 @@ jobs:
7376
7477
echo "flatpak-dir-shortname=${FLATPAK_DIR_SHORTNAME}" >> $GITHUB_OUTPUT
7578
79+
# Docker requires lowercase registry references
80+
- name: Lowercase Registry
81+
id: registry_case
82+
uses: ASzc/change-string-case-action@v6
83+
with:
84+
string: ${{ env.IMAGE_REGISTRY }}
85+
7686
- name: Determine Flatpak Dependencies
7787
id: flatpak_dependencies
7888
shell: bash
7989
run: |
8090
set -ex
81-
image="ghcr.io/ublue-os/${{ matrix.image_name }}:${{ steps.generate-tag.outputs.tag }}"
91+
image="${{ steps.registry_case.outputs.lowercase }}/${{ matrix.image_name }}:${{ steps.generate-tag.outputs.tag }}"
8292
# Make temp space
8393
TEMP_FLATPAK_INSTALL_DIR=$(mktemp -d -p ${{ github.workspace }} flatpak.XXX)
8494
# Get list of refs from directory
@@ -116,11 +126,11 @@ jobs:
116126
with:
117127
arch: x86_64
118128
image_name: ${{ matrix.image_name }}
119-
image_repo: ghcr.io/ublue-os
129+
image_repo: ${{ steps.registry_case.outputs.lowercase }}
120130
variant: 'Kinoite'
121131
version: ${{ matrix.major_version }}
122132
image_tag: ${{ steps.generate-tag.outputs.tag }}
123-
secure_boot_key_url: 'https://github.com/ublue-os/bazzite/raw/main/secure_boot.der'
133+
secure_boot_key_url: '${{ github.server_url }}/${{ github.repository }}/raw/main/secure_boot.der'
124134
enrollment_password: 'universalblue'
125135
iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}.iso
126136
enable_cache_dnf: "false"

0 commit comments

Comments
 (0)