diff --git a/.github/workflows/vyos-build.yaml b/.github/workflows/vyos-build.yaml index 1109745ef3..0076580131 100644 --- a/.github/workflows/vyos-build.yaml +++ b/.github/workflows/vyos-build.yaml @@ -52,7 +52,7 @@ jobs: - name: Configure shell: bash - run: "sudo ./vyos/build.sh" + run: "sudo bash ./vyos/build.sh" - name: Create release with artifact uses: ncipollo/release-action@v1 diff --git a/vyos/build.sh b/vyos/build.sh index 21e7663a0a..5e430d15d7 100755 --- a/vyos/build.sh +++ b/vyos/build.sh @@ -19,8 +19,12 @@ ATUIN_VERSION="${ATUIN_VERSION#*v}" TASK_VERSION="v3.35.0" TASK_VERSION="${TASK_VERSION#*v}" +pwd git clone --depth=1 --branch "${VYOS_VERSION}" --single-branch "${VYOS_URL}" ./vyos-build cd ./vyos-build +mkdir -p ./build ./packages +pwd +ls -AlhR . # debug curl -vL -o ./packages/sops.deb "https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops_${SOPS_VERSION}_${VYOS_ARCH}.deb" curl -vL -o ./packages/atuin.deb "https://github.com/atuinsh/atuin/releases/download/v${ATUIN_VERSION}/atuin_${ATUIN_VERSION}_${VYOS_ARCH}.deb" @@ -30,7 +34,7 @@ curl -v -o ./packages/duo-unix.deb "https://pkg.duosecurity.com/Debian/dists/bul # script assumes running as sudo/root make clean -./build-vyos-image iso \ +./scripts/build-vyos-image iso \ --architecture "${VYOS_ARCH}" \ --build-by "${VYOS_BUILDER:=root}" \ --build-type "${VYOS_BUILD_TYPE:=release}" \