allow multiple output locations

This commit is contained in:
Jason N. 2024-02-19 14:20:08 +00:00
parent 2290aa6209
commit 31b6b39b23
2 changed files with 4 additions and 9 deletions

View File

@ -36,10 +36,6 @@ jobs:
version: version:
- 38 - 38
- 39 - 39
- 40
include:
- version: 40
web_ui: 'true'
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -53,6 +49,5 @@ jobs:
IMAGE_TAG: 'latest' IMAGE_TAG: 'latest'
VARIANT: 'Kinoite' VARIANT: 'Kinoite'
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
WEB_UI: ${{ matrix.web_ui }}
ACTION_REPO: ${{ github.repository }} ACTION_REPO: ${{ github.repository }}
ACTION_REF: ${{ github.ref }} ACTION_REF: ${{ github.ref }}

View File

@ -26,13 +26,13 @@ endif
# Step 6: Build end ISO file # Step 6: Build end ISO file
## Default action ## Default action
$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt $(IMAGE_NAME)-$(IMAGE_TAG).iso: output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
mv output/$(IMAGE_NAME)-$(IMAGE_TAG).iso $(IMAGE_NAME)-$(IMAGE_TAG).iso
output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
mkdir $(_BASE_DIR)/output mkdir $(_BASE_DIR)/output
xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: $(IMAGE_NAME)-$(IMAGE_TAG).iso
cp $(IMAGE_NAME)-$(IMAGE_TAG).iso output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
# Step 2: Build boot.iso using Lorax # Step 2: Build boot.iso using Lorax
boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl
rm -Rf $(_BASE_DIR)/results rm -Rf $(_BASE_DIR)/results