morgan
/
isogenerator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inputs

This commit is contained in:
Jason N 2024-02-15 11:44:41 -05:00 committed by GitHub
parent 9d5ef0c115
commit feec50596a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/iso.yml vendored
View File

@ -35,13 +35,13 @@ on:
default: main default: main
env: env:
IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '39' }} IMAGE_VERSION: ${{ inputs.IMAGE_VERSION || '39' }}
IMAGE_ARCH: ${{ github.event.inputs.IMAGE_ARCH || 'x86_64' }} IMAGE_ARCH: ${{ inputs.IMAGE_ARCH || 'x86_64' }}
IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME || 'base-main' }} IMAGE_NAME: ${{ inputs.IMAGE_NAME || 'base-main' }}
IMAGE_REPO: ${{ github.event.inputs.IMAGE_REPO || 'ghcr.io/ublue-os' }} IMAGE_REPO: ${{ inputs.IMAGE_REPO || 'ghcr.io/ublue-os' }}
VARIANT: ${{ github.event.inputs.VARIANT || 'Silverblue' }} VARIANT: ${{ inputs.VARIANT || 'Silverblue' }}
CURR_REPO: ${{ github.event.inputs.BUILD_REPO || github.repository }} CURR_REPO: ${{ inputs.BUILD_REPO || github.repository }}
CURR_REF: ${{ github.event.inputs.BUILD_REF || github.ref }} CURR_REF: ${{ inputs.BUILD_REF || github.ref }}
jobs: jobs:
build-and-push-iso: build-and-push-iso:
@ -52,7 +52,6 @@ jobs:
permissions: permissions:
contents: read contents: read
packages: write packages: write
steps: steps:
- name: Install make and git - name: Install make and git
run: dnf install -y make git run: dnf install -y make git
@ -67,12 +66,18 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: make install-deps run: make install-deps
- name: Lowercase Registry
id: registry_case
uses: ASzc/change-string-case-action@v6
with:
string: ${{ env.IMAGE_REPO }}
- name: Download image - name: Download image
run: | run: |
make container/${IMAGE_NAME}-${IMAGE_VERSION} \ make container/${IMAGE_NAME}-${IMAGE_VERSION} \
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${{ steps.registry_case.outputs.lowercase }} \
image_name=${IMAGE_NAME} \ image_name=${IMAGE_NAME} \
variant=${VARIANT} variant=${VARIANT}
@ -81,7 +86,7 @@ jobs:
make boot.iso \ make boot.iso \
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${{ steps.registry_case.outputs.lowercase }} \
image_name=${IMAGE_NAME} \ image_name=${IMAGE_NAME} \
variant=${VARIANT} variant=${VARIANT}
@ -90,7 +95,7 @@ jobs:
make ${IMAGE_NAME}-${IMAGE_VERSION}.iso \ make ${IMAGE_NAME}-${IMAGE_VERSION}.iso \
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${{ steps.registry_case.outputs.lowercase }} \
image_name=${IMAGE_NAME} \ image_name=${IMAGE_NAME} \
variant=${VARIANT} variant=${VARIANT}
mkdir end_iso mkdir end_iso
@ -99,9 +104,9 @@ jobs:
- name: Upload ISO as artifact - name: Upload ISO as artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ISOs name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}.iso
path: end_iso/*.iso path: end_iso/*.iso
if-no-files-found: error if-no-files-found: error
retention-days: 0 retention-days: 0
compression-level: 0 compression-level: 0
overwrite: true overwrite: true