Skip to content

Commit 2c68491

Browse files
committed
Update matrix values, add step to upload artifact to release
Signed-off-by: Jonathan Haylett <[email protected]>
1 parent c70f439 commit 2c68491

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,58 @@ jobs:
1212
strategy:
1313
matrix:
1414
os:
15-
- ubuntu/jammy
16-
- rocky-container/9
15+
- ubuntu/noble
1716
version:
18-
- 1.27.15
19-
- 1.28.11
20-
- 1.29.6
21-
- 1.30.2
22-
- 1.31.1
17+
- 1.33.1
2318
steps:
2419
- uses: actions/checkout@v4
20+
2521
- uses: astral-sh/setup-uv@v5
2622
with:
2723
enable-cache: true
24+
2825
- run: uv sync
29-
- run: sudo apt-get install -y $(uv run bindep -b)
26+
27+
- run: sudo apt update && sudo apt install -y $(uv run bindep -b)
28+
3029
- uses: winterjung/split@7f51d99e7cc1f147f6f99be75acf5e641930af88 # v2.1.0
3130
id: split
3231
with:
3332
msg: ${{ matrix.os }}
3433
separator: "/"
34+
3535
- run: sudo chown root /bin/tar && sudo chmod u+s /bin/tar
3636
if: ${{ steps.split.outputs._0 == 'ubuntu' }}
37+
38+
- name: Set image filename env var
39+
run: echo "IMAGE_NAME=${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}" >> "$GITHUB_ENV"
40+
3741
- uses: actions/cache@v4
3842
with:
3943
path: /home/runner/.cache/image-create
40-
key: ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}-${{ github.head_ref || github.ref_name }}
44+
key: ${{ env.IMAGE_NAME }}-${{ github.head_ref || github.ref_name }}
4145
restore-keys: |
42-
${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}-${{ github.head_ref || github.ref_name }}
43-
${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}
46+
${{ env.IMAGE_NAME }}-${{ github.head_ref || github.ref_name }}
47+
${{ env.IMAGE_NAME }}
4448
${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}
45-
- run: uv run disk-image-create vm block-device-efi ${{ steps.split.outputs._0 }} kubernetes
49+
50+
- run: uv run disk-image-create -o "${IMAGE_NAME}.qcow2" vm block-device-efi ${{ steps.split.outputs._0 }} kubernetes
4651
env:
4752
ELEMENTS_PATH: ${{ github.workspace }}/elements
4853
DIB_RELEASE: ${{ steps.split.outputs._1 }}
4954
DIB_KUBERNETES_VERSION: ${{ matrix.version }}
5055
DIB_MIN_TMPFS: "4"
51-
- uses: actions/upload-artifact@v4
56+
57+
- name: Publish artifact
58+
uses: actions/upload-artifact@v4
5259
with:
53-
name: ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}
54-
path: image.qcow2
60+
name: ${{ env.IMAGE_NAME }}
61+
path: ${{ env.IMAGE_NAME }}.qcow2
5562
if-no-files-found: error
5663
retention-days: 7
64+
65+
- name: Upload image to release
66+
uses: softprops/action-gh-release@v1
67+
if: github.ref_type == 'tag'
68+
with:
69+
files: ${{ env.IMAGE_NAME }}.qcow2

0 commit comments

Comments
 (0)