Skip to content

Commit a8b7894

Browse files
ci: include os/arch in per-commit tar filenames
Right now the tar name will looks something like this: microkit-sdk-1.4.1-dev.52+9a8aba7.tar.gz for every OS/arch build whereas we want the SDK itself to still be without arch/name but the tar should still include what the target is. Signed-off-by: Ivan-Velickovic <i.velickovic@unsw.edu.au>
1 parent 2e27422 commit a8b7894

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/sdk.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ jobs:
5757
- name: Set version
5858
run: echo "SDK_VERSION=$(./ci/dev_version.sh)" >> $GITHUB_ENV
5959
- name: Build SDK (x86-64)
60-
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }} --tool-target-triple="x86_64-unknown-linux-musl"
60+
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }}-linux-x86-64 --tool-target-triple="x86_64-unknown-linux-musl"
6161
- name: Upload SDK (x86-64)
6262
uses: actions/upload-artifact@v4
6363
with:
6464
name: microkit-sdk-${{ env.SDK_VERSION }}-linux-x86-64
65-
path: release/microkit-sdk-${{ env.SDK_VERSION }}.tar.gz
65+
path: release/microkit-sdk-${{ env.SDK_VERSION }}-linux-x86-64.tar.gz
6666
- name: Build SDK (ARM64)
67-
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }} --tool-target-triple="aarch64-unknown-linux-musl"
67+
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }}-linux-aarch64 --tool-target-triple="aarch64-unknown-linux-musl"
6868
- name: Upload SDK (ARM64)
6969
uses: actions/upload-artifact@v4
7070
with:
7171
name: microkit-sdk-${{ env.SDK_VERSION }}-linux-aarch64
72-
path: release/microkit-sdk-${{ env.SDK_VERSION }}.tar.gz
72+
path: release/microkit-sdk-${{ env.SDK_VERSION }}-linux-aarch64.tar.gz
7373
build_macos:
7474
name: Build SDK (macOS x86-64, ARM64)
7575
runs-on: macos-14
@@ -103,16 +103,16 @@ jobs:
103103
- name: Set version
104104
run: echo "SDK_VERSION=$(./ci/dev_version.sh)" >> $GITHUB_ENV
105105
- name: Build SDK (x86-64)
106-
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }} --tool-target-triple=x86_64-apple-darwin
106+
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }}-macos-x86-64 --tool-target-triple=x86_64-apple-darwin
107107
- name: Upload SDK (x86-64)
108108
uses: actions/upload-artifact@v4
109109
with:
110110
name: microkit-sdk-${{ env.SDK_VERSION }}-macos-x86-64
111-
path: release/microkit-sdk-${{ env.SDK_VERSION }}.tar.gz
111+
path: release/microkit-sdk-${{ env.SDK_VERSION }}-macos-x86-64.tar.gz
112112
- name: Build SDK (ARM64)
113-
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }} --tool-target-triple=aarch64-apple-darwin
113+
run: ./pyenv/bin/python build_sdk.py --sel4=seL4 --version ${{ env.SDK_VERSION }}-macos-aarch64 --tool-target-triple=aarch64-apple-darwin
114114
- name: Upload SDK (ARM64)
115115
uses: actions/upload-artifact@v4
116116
with:
117117
name: microkit-sdk-${{ env.SDK_VERSION }}-macos-aarch64
118-
path: release/microkit-sdk-${{ env.SDK_VERSION }}.tar.gz
118+
path: release/microkit-sdk-${{ env.SDK_VERSION }}-macos-aarch64.tar.gz

0 commit comments

Comments
 (0)