mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
use separate names
This commit is contained in:
parent
fcd2f92f30
commit
4f61576670
6 changed files with 48 additions and 13 deletions
11
.github/workflows/build_iso.yml
vendored
11
.github/workflows/build_iso.yml
vendored
|
|
@ -10,6 +10,9 @@ on:
|
|||
flatpaks_refs_dir:
|
||||
required: false
|
||||
type: string
|
||||
suffix:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
load_vars:
|
||||
|
|
@ -114,7 +117,7 @@ jobs:
|
|||
flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }}
|
||||
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
|
||||
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
|
||||
iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
|
||||
iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
|
||||
|
||||
- name: Save output
|
||||
id: save_output
|
||||
|
|
@ -126,10 +129,10 @@ jobs:
|
|||
id: upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}
|
||||
name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}
|
||||
path: |
|
||||
build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
|
||||
build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso-CHECKSUM
|
||||
build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
|
||||
build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso-CHECKSUM
|
||||
if-no-files-found: error
|
||||
retention-days: 0
|
||||
compression-level: 0
|
||||
|
|
|
|||
3
.github/workflows/test_deployment.yml
vendored
3
.github/workflows/test_deployment.yml
vendored
|
|
@ -7,6 +7,9 @@ on:
|
|||
parent_job_name:
|
||||
required: true
|
||||
type: string
|
||||
suffix:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
load_vars:
|
||||
|
|
|
|||
7
.github/workflows/test_iso.yml
vendored
7
.github/workflows/test_iso.yml
vendored
|
|
@ -7,6 +7,9 @@ on:
|
|||
parent_job_name:
|
||||
required: true
|
||||
type: string
|
||||
suffix:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
load_vars:
|
||||
|
|
@ -72,7 +75,7 @@ jobs:
|
|||
- name: Download generated ISO
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: ${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}
|
||||
name: ${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}
|
||||
|
||||
- name: Run ISO checks
|
||||
run: |
|
||||
|
|
@ -86,7 +89,7 @@ jobs:
|
|||
FLATPAK_REMOTE_REFS_DIR=${{ needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR }} \
|
||||
SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
|
||||
ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \
|
||||
ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}.iso
|
||||
ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
|
||||
|
||||
- name: Set status
|
||||
if: inputs.pr && always()
|
||||
|
|
|
|||
|
|
@ -24,4 +24,7 @@ jobs:
|
|||
|
||||
- name: Run test
|
||||
run: |
|
||||
/bin/bash tests/repo/vars.sh
|
||||
apt-get update
|
||||
apt-get install -y make
|
||||
make test/repo/install-deps
|
||||
make test/repo
|
||||
31
.github/workflows/tests.yml
vendored
31
.github/workflows/tests.yml
vendored
|
|
@ -38,11 +38,32 @@ jobs:
|
|||
uses: ./.github/workflows/build_iso.yml
|
||||
with:
|
||||
pr: ${{ inputs.pr }}
|
||||
parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO
|
||||
parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO with Flatpaks
|
||||
flatpaks_refs_dir: /github/workspace/flatpak_refs
|
||||
suffix: flatpaks
|
||||
|
||||
build_iso_no_flatpaks:
|
||||
name: Build ISO without Flatpaks
|
||||
test_iso_flatpaks:
|
||||
name: Test ISO with Flatpaks
|
||||
needs:
|
||||
- build_iso_flatpaks
|
||||
uses: ./.github/workflows/test_iso.yml
|
||||
with:
|
||||
pr: ${{ inputs.pr }}
|
||||
parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO with Flatpaks
|
||||
suffix: flatpaks
|
||||
|
||||
test_deployment_flatpaks:
|
||||
name: Test Deployment with Flatpaks
|
||||
needs:
|
||||
- build_iso_flatpaks
|
||||
uses: ./.github/workflows/test_deployment.yml
|
||||
with:
|
||||
pr: ${{ inputs.pr }}
|
||||
parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment with Flatpaks
|
||||
suffix: flatpaks
|
||||
|
||||
build_iso:
|
||||
name: Build ISO
|
||||
needs:
|
||||
- build_container
|
||||
uses: ./.github/workflows/build_iso.yml
|
||||
|
|
@ -53,7 +74,7 @@ jobs:
|
|||
test_iso:
|
||||
name: Test ISO
|
||||
needs:
|
||||
- build_iso_flatpaks
|
||||
- build_iso
|
||||
uses: ./.github/workflows/test_iso.yml
|
||||
with:
|
||||
pr: ${{ inputs.pr }}
|
||||
|
|
@ -62,7 +83,7 @@ jobs:
|
|||
test_deployment:
|
||||
name: Test Deployment
|
||||
needs:
|
||||
- build_iso_flatpaks
|
||||
- build_iso
|
||||
uses: ./.github/workflows/test_deployment.yml
|
||||
with:
|
||||
pr: ${{ inputs.pr }}
|
||||
|
|
|
|||
|
|
@ -6,4 +6,6 @@ $(REPO_TESTS):
|
|||
chmod +x $@
|
||||
./$@
|
||||
|
||||
install-deps:
|
||||
|
||||
.PHONY: $(REPO_TESTS)
|
||||
Loading…
Add table
Add a link
Reference in a new issue