actions/build-container-installer
1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00
Code Releases Activity

revert conditionals

Browse source
This commit is contained in:
Jason N. 2024-03-13 11:23:58 -04:00
parent 2dde2b4f5c
commit 62c5423ee7
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build-and-test.yml vendored
View file

@ -8,6 +8,11 @@ on:
- 'v*' - 'v*'
pull_request: pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
# Test Values # Test Values
env: env:
ARCH: 'x86_64' ARCH: 'x86_64'

16
Makefile
View file

@ -161,9 +161,10 @@ boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FIL
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
# Download the secure boot key # Download the secure boot key
ifneq ($(SECURE_BOOT_KEY_URL),) if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL) then \
endif curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL); \
fi
lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \ lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
--isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(_BASE_DIR)/external/lorax/share/templates.d/99-generic \ --isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(_BASE_DIR)/external/lorax/share/templates.d/99-generic \
@ -235,13 +236,14 @@ test-iso:
done done
# flapak tests # flapak tests
ifneq ($(FLATPAK_REMOTE_REFS),) if [ -n "$(FLATPAK_REMOTE_REFS)" ]; \
chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test)) then \
chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test)); \
for test in $(_TESTS); \ for test in $(_TESTS); \
do \ do \
$(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \ $(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \
done done; \
endif fi
# Cleanup # Cleanup
sudo umount /mnt/install sudo umount /mnt/install