-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
37 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,9 +54,9 @@ jobs: | |
runs-on: ubuntu-24.04 | ||
permissions: | ||
contents: write | ||
container: | ||
image: vyos/vyos-build:current | ||
options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged | ||
# container: | ||
# image: vyos/vyos-build:current | ||
# options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged | ||
outputs: | ||
BUILD_BY: ${{ steps.set_env_variables.outputs.BUILD_BY }} | ||
build_version: ${{ steps.set_env_variables.outputs.build_version }} | ||
|
@@ -96,19 +96,24 @@ jobs: | |
id: build_generic_iso | ||
run: | | ||
cd vyos-build | ||
sudo --preserve-env ./build-vyos-image \ | ||
--architecture amd64 \ | ||
--build-by $BUILD_BY \ | ||
--build-type release \ | ||
--custom-package vyos-1x-smoketest \ | ||
--debian-mirror $DEBIAN_MIRROR \ | ||
--debian-security-mirror $DEBIAN_SECURITY_MIRROR \ | ||
--version ${{ steps.set_env_variables.outputs.build_version }} \ | ||
--vyos-mirror $VYOS_MIRROR \ | ||
generic | ||
# sudo --preserve-env ./build-vyos-image \ | ||
# --architecture amd64 \ | ||
# --build-by $BUILD_BY \ | ||
# --build-type release \ | ||
# --custom-package vyos-1x-smoketest \ | ||
# --debian-mirror $DEBIAN_MIRROR \ | ||
# --debian-security-mirror $DEBIAN_SECURITY_MIRROR \ | ||
# --version ${{ steps.set_env_variables.outputs.build_version }} \ | ||
# --vyos-mirror $VYOS_MIRROR \ | ||
# generic | ||
mkdir build | ||
cd build | ||
GENERIC_IMAGE_NAME=$(jq --raw-output .artifacts[0] manifest.json | sed -e 's/.iso//') | ||
GENERIC_IMAGE_ISO=$(jq --raw-output .artifacts[0] manifest.json) | ||
wget https://github.com/vyos/vyos-nightly-build/releases/download/1.5-rolling-202412310006/vyos-1.5-rolling-202412310006-generic-amd64.iso | ||
GENERIC_IMAGE_NAME="vyos-1.5-rolling-202412310006-generic-amd64" | ||
GENERIC_IMAGE_ISO="vyos-1.5-rolling-202412310006-generic-amd64.iso" | ||
# GENERIC_IMAGE_NAME=$(jq --raw-output .artifacts[0] manifest.json | sed -e 's/.iso//') | ||
# GENERIC_IMAGE_ISO=$(jq --raw-output .artifacts[0] manifest.json) | ||
echo "generic_image_iso=${GENERIC_IMAGE_ISO}" >> $GITHUB_OUTPUT | ||
echo "generic_image_name=${GENERIC_IMAGE_NAME}" >> $GITHUB_OUTPUT | ||
# Sign build artifact | ||
|
@@ -377,15 +382,27 @@ jobs: | |
runs-on: ubuntu-24.04 | ||
permissions: | ||
contents: write | ||
if: ${{ (needs.build_iso.result == 'success') && | ||
(needs.test_config_load.result == 'success' || inputs.SKIP_SMOKETEST_CONFIG == 'true') && | ||
needs: [build_iso] | ||
if: ${{ (needs.test_config_load.result == 'success' || inputs.SKIP_SMOKETEST_CONFIG == 'true') && | ||
(needs.test_raid1_install.result == 'success' || inputs.SKIP_SMOKETEST_RAID1 == 'true') && | ||
(needs.test_smoketest_cli.result == 'success' || inputs.SKIP_SMOKETEST_CLI == 'true') && | ||
(needs.test_interfaces_cli.result == 'success' || inputs.SKIP_SMOKETEST_INTERFACES == 'true') && | ||
(needs.test_encrypted_config_tpm.result == 'success' || inputs.SKIP_SMOKETEST_TPM == 'true') && | ||
(github.ref == 'refs/heads/dependency-improvements') && | ||
(inputs.SKIP_RELEASE_PUBLISHING == 'false') }} | ||
steps: | ||
- name: Debug Conditions | ||
run: | | ||
echo "Test Config Load Result: ${{ needs.test_config_load.result }}" | ||
echo "Test RAID1 Install Result: ${{ needs.test_raid1_install.result }}" | ||
echo "Test Smoketest CLI Result: ${{ needs.test_smoketest_cli.result }}" | ||
echo "Test Encrypted Config TPM Result: ${{ needs.test_encrypted_config_tpm.result }}" | ||
echo "Branch: ${{ github.ref }}" | ||
echo "Skip Smoketest Config: ${{ inputs.SKIP_SMOKETEST_CONFIG }}" | ||
echo "Skip Smoketest RAID1: ${{ inputs.SKIP_SMOKETEST_RAID1 }}" | ||
echo "Skip Smoketest CLI: ${{ inputs.SKIP_SMOKETEST_CLI }}" | ||
echo "Skip Smoketest TPM: ${{ inputs.SKIP_SMOKETEST_TPM }}" | ||
echo "Skip Release Publishing: ${{ inputs.SKIP_RELEASE_PUBLISHING }}" | ||
- uses: actions/checkout@v4 | ||
- name: Clone vyos-build repo | ||
uses: actions/checkout@v4 | ||
|
@@ -477,19 +494,15 @@ jobs: | |
with: | ||
name: ${{ needs.build_iso.outputs.generic_image_name }} | ||
|
||
- name: Debug artifact path | ||
run: | | ||
find . -type f | ||
- name: "Release publishing: publish release" | ||
uses: softprops/action-gh-release@v2 | ||
with: | ||
body_path: CHANGELOG.md | ||
tag_name: ${{ needs.build_iso.outputs.build_version }} | ||
fail_on_unmatched_files: true | ||
files: | | ||
./${{ needs.build_iso.outputs.generic_image_iso }} | ||
./${{ needs.build_iso.outputs.generic_image_iso }}.minisig | ||
vyos-build/build/${{ needs.build_iso.outputs.generic_image_iso }} | ||
vyos-build/build/${{ needs.build_iso.outputs.generic_image_iso }}.minisig | ||
- uses: Nats-ji/[email protected] | ||
with: | ||
|