From fc025d17924f1706dc12e21dd86dce5d1a9a5540 Mon Sep 17 00:00:00 2001 From: Florian Wilhelm <2292245+fwilhe@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:02:51 +0000 Subject: [PATCH] Change ostreeImage feature type to platform Also fix paths in github workflow --- .github/workflows/image.yml | 8 ++++---- gardenlinux/features/ostreeImage/info.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 768bfea..a6b5a1a 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -21,7 +21,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ostree-${{ matrix.arch }}-trixie-image - path: debian/.build/ostreeImage-${{ matrix.arch }}-trixie*.ostreeImage.tar.gz + path: debian/.build/*ostreeImage-${{ matrix.arch }}-trixie-*.ostree.raw retention-days: 2 gardenlinux-image: @@ -36,11 +36,11 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Build the image - run: ./build ${{ matrix.platform }}_dev_curl-ostreeImage-${{ matrix.arch }} + run: ./build ostreeImage-${{ matrix.arch }} working-directory: ./gardenlinux - name: Upload ${{ matrix.arch }} image uses: actions/upload-artifact@v3 with: - name: ${{ matrix.platform }}_dev_curl-ostreeImage-${{ matrix.arch }} - path: gardenlinux/.build/${{ matrix.platform }}*ostreeImage-${{ matrix.arch }}*.ostreeImage.tar.gz + name: ostreeImage-${{ matrix.arch }} + path: gardenlinux/.build/*ostreeImage-${{ matrix.arch }}-today-*.ostree.raw retention-days: 2 diff --git a/gardenlinux/features/ostreeImage/info.yaml b/gardenlinux/features/ostreeImage/info.yaml index 69ea904..6bc5f79 100644 --- a/gardenlinux/features/ostreeImage/info.yaml +++ b/gardenlinux/features/ostreeImage/info.yaml @@ -1,2 +1,2 @@ description: 'image-based system using OSTree' -type: element +type: platform