diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 990de53..4c89f38 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -107,6 +107,7 @@ jobs: arch: ${{ needs.load_vars.outputs.ARCH }} image_name: ${{ matrix.image_name }} image_repo: ${{ matrix.image_repo}} + image_src: ${{ matrix.image_src }} image_tag: ${{ matrix.version }} version: ${{ matrix.version }} repos: ${{ matrix.repos }} @@ -118,6 +119,7 @@ jobs: iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso - name: Upload ISO as artifact + if: matrix.version != 'fake' id: upload uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index 1f9cf95..6806eaa 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -37,6 +37,12 @@ on: "version": "40", "image_repo": "quay.io/fedora", "image_name": "fedora-bootc" + }, + { + "version": "fake", + "image_repo": "quay.io/fedora", + "image_name": "fedora-bootc", + "image_src": "docker://quay.io/fedora-ostree-desktops/base:39" } ] }' diff --git a/container/Makefile b/container/Makefile index c9f7c4a..9e662dc 100644 --- a/container/Makefile +++ b/container/Makefile @@ -1,9 +1,5 @@ -ifeq ($(IMAGE_SRC),) -IMAGE_SRC := docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) -endif - $(IMAGE_NAME)-$(IMAGE_TAG): - skopeo copy $(IMAGE_SRC) oci:$(IMAGE_NAME)-$(IMAGE_TAG) + skopeo copy $(if $(IMAGE_SRC),$(IMAGE_SRC),docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)) oci:$(IMAGE_NAME)-$(IMAGE_TAG) install-deps: $(install_pkg) skopeo