From 46fd412c888aa0d92f87d894fd1dbb25a7c6d9bf Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 1 Mar 2024 05:04:38 +0800 Subject: [PATCH] fix(gha/vyos-build): left env var name blank --- .github/workflows/vyos-build.yaml | 4 ++-- vyos/build.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vyos-build.yaml b/.github/workflows/vyos-build.yaml index 1109745e..8e9e147f 100644 --- a/.github/workflows/vyos-build.yaml +++ b/.github/workflows/vyos-build.yaml @@ -17,7 +17,7 @@ on: - .github/workflows/vyos-build.yaml env: - VYOS_BUILDER: "${{ github.repository }}" + VYOS_BUILDER: "${{ github.repository_owner }}" # renovate: datasource=github-tags depName=vyos/vyos-1x VYOS_VERSION: "1.4.0-epa1" VYOS_ARCH: "amd64" @@ -52,7 +52,7 @@ jobs: - name: Configure shell: bash - run: "sudo ./vyos/build.sh" + run: "sudo VYOS_VERSION=${{ env.VYOS_VERSION }} VYOS_ARCH=${{ env.VYOS_ARCH }} VYOS_BUILDER=${{ env.VYOS_BUILDER }} VYOS_BUILD_TIME=${{ env.VYOS_BUILD_TIME }} 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 21e7663a..568cfec0 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"