mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
Merge branch 'main' into test_qemu
This commit is contained in:
commit
ec1403592f
3 changed files with 6 additions and 5 deletions
1
.github/workflows/build-and-test.yml
vendored
1
.github/workflows/build-and-test.yml
vendored
|
|
@ -112,7 +112,6 @@ jobs:
|
|||
image_repo: ${{ env.IMAGE_REPO}}
|
||||
version: ${{ env.VERSION }}
|
||||
variant: ${{ env.VARIANT }}
|
||||
action_version: ${{ steps.meta.outputs.tags || 'latest' }}
|
||||
|
||||
- name: Build ISO with latest container
|
||||
if: needs.check-changes.outputs.container == 'false'
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ This action is designed to be called from a GitHub workflow using the following
|
|||
image_repo: ${{ env.IMAGE_REPO}}
|
||||
version: ${{ env.VERSION }}
|
||||
variant: ${{ env.VARIANT }}
|
||||
action_version: v1.0.0
|
||||
```
|
||||
|
||||
See [Customizing](#customizing) for information about customizing the ISO that gets created using `with`
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ inputs:
|
|||
default: "false"
|
||||
action_version:
|
||||
description: Version of the action container to run
|
||||
required: true
|
||||
default: "latest"
|
||||
deprecationMessage: No longer used. github.action_ref replaces the need for this. Will be removed in a future version.
|
||||
required: false
|
||||
additional_templates:
|
||||
description: Space delimetered list of additional Lorax templates to include
|
||||
required: false
|
||||
|
|
@ -43,7 +43,10 @@ runs:
|
|||
- name: Run docker image
|
||||
shell: bash
|
||||
run: |
|
||||
docker run --privileged --volume .:/github/workspace/ ghcr.io/jasonn3/build-container-installer:${{ inputs.action_version }} \
|
||||
# Check if running inside of the action repo
|
||||
if [[ -z "${{ github.action_ref }}" ]]; then if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]; then tag=pr-${BASH_REMATCH[1]}; else tag=${{ github.ref_name }}; fi; fi
|
||||
if [[ -z "${tag}" ]]; then tag=${{ github.action_ref }}; fi
|
||||
docker run --privileged --volume .:/github/workspace/ ghcr.io/jasonn3/build-container-installer:${tag} \
|
||||
ARCH=${{ inputs.arch }} \
|
||||
IMAGE_NAME=${{ inputs.image_name }} \
|
||||
IMAGE_REPO=${{ inputs.image_repo }} \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue