Skip to content

Commit ec44bea

Browse files
Add ISO builds to CI: (#245)
## Description <!--- Please describe what this PR is going to change --> This adds ISO builds to CI and releases. Remove deprecated CI directory. ## Why is this needed <!--- Link to issue you have raised --> Fixes: # ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## How are existing users impacted? What migration steps/scripts do we need? <!--- Fixes a bug, unblocks installation, removes a component of the stack etc --> <!--- Requires a DB migration script, etc. --> ## Checklist: I have: - [ ] updated the documentation and/or roadmap (if required) - [ ] added unit or e2e tests - [ ] provided instructions on how to upgrade
2 parents fbb29ea + 7fdba3c commit ec44bea

File tree

7 files changed

+20
-253
lines changed

7 files changed

+20
-253
lines changed

.github/workflows/build-all-matrix.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env: # Global environment, passed to all jobs & all steps
1919
# To do so, set the secret DOCKERHUB_USERNAME and DOCKERHUB_PASSWORD in the repo secrets, and set the below to yes.
2020
LOGIN_TO_DOCKERHUB: "yes"
2121

22-
HOOK_VERSION: "0.9.1-build-${{github.run_number}}" # Use a forced Hook version
22+
HOOK_VERSION: "0.9.2-build-${{github.run_number}}" # Use a forced Hook version
2323

2424
# Which flavors to build? space separated list, must match one of the TAG='s in flavors (this is used by matrix_prep job in gha-matrix command)
2525
CI_TAGS: "standard armbian-sbc armbian-uefi lts" # 'dev' is not included
@@ -165,11 +165,19 @@ jobs:
165165
DO_BUILD_LK_CONTAINERS: "no" # already built them; this is only for hook/linuxkit.
166166
run: bash build.sh build "${{ matrix.kernel }}"
167167

168+
- name: "Build Hook ISO with Kernel ${{matrix.kernel}} (${{ matrix.arch }}) - cache: ${{matrix.gha_cache}}"
169+
if: ${{ matrix.kernel == 'hook-latest-lts-amd64' || matrix.kernel == 'hook-default-amd64' || matrix.kernel == 'hook-latest-lts-arm64' || matrix.kernel == 'hook-default-arm64' }}
170+
env:
171+
DO_BUILD_LK_CONTAINERS: "no" # already built them; this is only for hook/linuxkit.
172+
run: bash build.sh build "${{ matrix.kernel }}" LINUXKIT_ISO=yes
173+
168174
- name: Upload deb as artifact ${{ matrix.arch.name }} ${{ matrix.distro }}
169175
uses: actions/upload-artifact@v4
170176
with:
171177
name: "hook-tarball-${{ matrix.kernel }}"
172-
path: out/*.tar.gz
178+
path: |
179+
out/*.tar.gz
180+
out/*.iso
173181
174182
release-latest:
175183
name: Publish all Hooks to GitHub Releases
@@ -226,7 +234,9 @@ jobs:
226234
uses: jmgilman/actions-generate-checksum@v1
227235
with:
228236
method: sha512
229-
patterns: "*.tar.gz"
237+
patterns: |
238+
"*.tar.gz"
239+
"*.iso"
230240
231241
- name: Update latest release
232242
uses: softprops/action-gh-release@v2
@@ -235,6 +245,7 @@ jobs:
235245
body: ${{env.RELEASE_NOTES}}
236246
files: |
237247
*.tar.gz
248+
*.iso
238249
checksum.txt
239250
prerelease: true
240251
tag_name: latest
@@ -270,7 +281,9 @@ jobs:
270281
uses: jmgilman/actions-generate-checksum@v1
271282
with:
272283
method: sha512
273-
patterns: "*.tar.gz"
284+
patterns: |
285+
"*.tar.gz"
286+
"*.iso"
274287
275288
- name: Update tag release
276289
uses: softprops/action-gh-release@v2
@@ -279,6 +292,7 @@ jobs:
279292
body: ${{env.RELEASE_NOTES}}
280293
files: |
281294
*.tar.gz
295+
*.iso
282296
checksum.txt
283297
prerelease: true
284298
tag_name: ${{github.ref}}

.github/workflows/deprecated/ci.yaml

Lines changed: 0 additions & 162 deletions
This file was deleted.

.github/workflows/deprecated/formatters-and-linters.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/deprecated/kernel-ci.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/deprecated/kernel-push.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

bash/linuxkit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function linuxkit_build() {
9292
"--docker"
9393
"--arch" "${kernel_info['DOCKER_ARCH']}"
9494
"--format" "iso-efi-initrd"
95-
"--name" "hook"
95+
"--name" "hook-${OUTPUT_ID}"
9696
"--cache" "${lk_cache_dir}"
9797
"--dir" "${lk_iso_output_dir}"
9898
"hook.${inventory_id}.yaml" # the linuxkit configuration file

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else # otherwise default to tty, but allow override
4343
fi
4444

4545
# Set the default HOOK_VERSION; override with env var; -x exports it for envsubst later
46-
declare -g -r -x HOOK_VERSION="${HOOK_VERSION:-"0.9.1"}"
46+
declare -g -r -x HOOK_VERSION="${HOOK_VERSION:-"0.9.2"}"
4747
log info "Using Hook version (HOOK_VERSION): ${HOOK_VERSION}"
4848

4949
### Inventory

0 commit comments

Comments
 (0)