mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
stop duplicate run
This commit is contained in:
parent
ee149ccf88
commit
b7812cd06b
2 changed files with 6 additions and 5 deletions
2
.github/workflows/build-and-test.yml
vendored
2
.github/workflows/build-and-test.yml
vendored
|
|
@ -113,7 +113,7 @@ jobs:
|
|||
image_tag: ${{ env.IMAGE_TAG }}
|
||||
version: ${{ matrix.version }}
|
||||
variant: ${{ env.VARIANT }}
|
||||
flatpak_remote_refs: ${{ env.FLATPAK_REMOTE_REFS }}
|
||||
flatpak_remote_refs_dir: ${{ env.FLATPAK_REMOTE_REFS_DIR }}
|
||||
secure_boot_key_url: ${{ env.SECURE_BOOT_KEY_URL }}
|
||||
enrollment_password: ${{ env.ENROLLMENT_PASSWORD }}
|
||||
iso_name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
|
||||
|
|
|
|||
9
Makefile
9
Makefile
|
|
@ -129,9 +129,10 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.tx
|
|||
xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
|
||||
implantisomd5 build/deploy.iso
|
||||
|
||||
lorax_repo:
|
||||
external/lorax/branch-$(VERSION):
|
||||
git config advice.detachedHead false
|
||||
cd external/lorax && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
|
||||
cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
|
||||
touch external/lorax/branch-$(VERSION)
|
||||
|
||||
# Step 1: Generate Lorax Templates
|
||||
lorax_templates/post_%.tmpl: lorax_templates/scripts/post/%
|
||||
|
|
@ -151,7 +152,7 @@ repos/%.repo: /etc/yum.repos.d/%.repo
|
|||
sed -i "s/\$$basearch/${ARCH}/g" $(_BASE_DIR)/repos/$*.repo
|
||||
|
||||
# Step 3: Build boot.iso using Lorax
|
||||
boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
||||
boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
||||
rm -Rf $(_BASE_DIR)/results || true
|
||||
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
|
||||
|
||||
|
|
@ -249,4 +250,4 @@ test-vm:
|
|||
chmod +x $(foreach test,$(_TESTS),tests/vm/$(test))
|
||||
for test in $(_TESTS); do ./tests/vm/$${test} deploy.iso; done
|
||||
|
||||
.PHONY: clean install-deps test test-iso test-vm lorax_repo
|
||||
.PHONY: clean install-deps test test-iso test-vm
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue