diff --git a/.github/workflows/vyos-build.yaml b/.github/workflows/vyos-build.yaml index 0f3ba818..61b805d8 100644 --- a/.github/workflows/vyos-build.yaml +++ b/.github/workflows/vyos-build.yaml @@ -33,7 +33,7 @@ env: DUO_VERSION: "duo_unix-2.0.3" jobs: - release: + build: runs-on: ubuntu-latest permissions: contents: write @@ -82,6 +82,7 @@ jobs: path: "./vyos-build/build/vyos-${{ env.VYOS_VERSION }}-${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}.iso" upload: + needs: build runs-on: ubuntu-latest container: image: "docker.io/rclone/rclone:1.65.2@sha256:df19eb113773539c45fdce109e09aa51f222cd0e32f08a3116eebfef2556bf29" # must be at least Alpine base, because of scripting @@ -106,7 +107,7 @@ jobs: run: | # first copies ISO as is, then copies ISO with common "latest" filename (with some filters to avoid hardcoding and safeguard against uploading the wrong thing if somehow >1 file), then deletes files older than the past 5 number of files under that arch and builder name rclone copy ./ r2:vyos-build/ - rclone copyto --max-age 1h --include "*${{ env.VYOS_BUILDER }}*.iso" r2:vyos-build/${{ env.VYOS_ARCH }}.iso + rclone copyto --max-age 1h --include "*${{ env.VYOS_BUILDER }}*.iso" ./ r2:vyos-build/${{ env.VYOS_ARCH }}.iso rclone lsf --format=p r2:vyos-build | grep "${{ env.VYOS_BUILDER }}" | grep "${{ env.VYOS_ARCH }}" | tail -n +5 | rclone delete --files-from - r2:vyos-build rclone cleanup r2:vyos-build