Skip to content

Commit bfb2aaa

Browse files
authored
update workflows
1 parent 1e73d87 commit bfb2aaa

File tree

4 files changed

+47
-5
lines changed

4 files changed

+47
-5
lines changed

.github/actions/linux-setup-spacemit/action.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: "Linux - Setup SpacemiT Toolchain"
22
description: "Setup SpacemiT Toolchain for Linux"
33
inputs:
4+
path:
5+
description: "Installation path"
6+
required: true
47
version:
58
description: "SpacemiT toolchain version"
69
required: true

.github/workflows/build-cache.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,4 @@ jobs:
8686
if: steps.cache-rocm.outputs.cache-hit != 'true'
8787
uses: ./.github/actions/windows-setup-rocm
8888
with:
89-
path: C:\Program Files\AMD\ROCm
9089
version: ${{ env.HIPSDK_INSTALLER_VERSION }}

.github/workflows/build-linux-cross.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,26 @@ jobs:
257257
ubuntu-24-riscv64-cpu-spacemit-ime-cross:
258258
runs-on: ubuntu-24.04
259259

260+
env:
261+
# Make sure this is in sync with build-cache.yml
262+
SPACEMIT_IME_TOOLCHAIN_VERSION: "1.1.2"
263+
260264
steps:
261265
- uses: actions/checkout@v4
262266

263267
- name: Use SpacemiT Toolchain Cache
264-
uses: ./.github/actions/ubuntu-spacemit-cache
268+
uses: actions/cache@v4
269+
id: cache-toolchain
270+
with:
271+
path: ./spacemit_toolchain
272+
key: spacemit-ime-toolchain-v${{ env.SPACEMIT_IME_TOOLCHAIN_VERSION }}-${{ runner.os }}
273+
274+
- name: Setup SpacemiT Toolchain
275+
if: steps.cache-toolchain.outputs.cache-hit != 'true'
276+
uses: ./.github/actions/linux-setup-spacemit
277+
with:
278+
path: ./spacemit_toolchain
279+
version: ${{ env.SPACEMIT_IME_TOOLCHAIN_VERSION }}
265280

266281
- name: Build
267282
run: |

.github/workflows/build.yml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,24 @@ jobs:
408408
sudo apt-get update -y
409409
sudo apt-get install -y build-essential mesa-vulkan-drivers libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libcurl4-openssl-dev
410410
411+
- name: Get latest Vulkan SDK version
412+
id: vulkan_sdk_version
413+
run: |
414+
echo "VULKAN_SDK_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.txt)" >> "$GITHUB_ENV"
415+
411416
- name: Use Vulkan SDK Cache
412-
id: cache_vulkan_sdk
413-
uses: ./.github/actions/ubuntu-vulkan-cache
417+
uses: actions/cache@v4
418+
id: cache-sdk
419+
with:
420+
path: ./vulkan_sdk
421+
key: vulkan-sdk-${{ env.VULKAN_SDK_VERSION }}-${{ runner.os }}
422+
423+
- name: Setup Vulkan SDK
424+
if: steps.cache-sdk.outputs.cache-hit != 'true'
425+
uses: ./.github/actions/linux-setup-vulkan
426+
with:
427+
path: ./vulkan_sdk
428+
version: ${{ env.VULKAN_SDK_VERSION }}
414429

415430
- name: Build
416431
id: cmake_build
@@ -1095,6 +1110,7 @@ jobs:
10951110
env:
10961111
# The ROCm version must correspond to the version used in the HIP SDK.
10971112
ROCM_VERSION: "6.4.2"
1113+
# Make sure this is in sync with build-cache.yml
10981114
HIPSDK_INSTALLER_VERSION: "25.Q3"
10991115

11001116
steps:
@@ -1110,8 +1126,17 @@ jobs:
11101126
7z x data.tar
11111127
11121128
- name: Use ROCm Installation Cache
1129+
uses: actions/cache@v4
11131130
id: cache-rocm
1114-
uses: ./.github/actions/windows-rocm-cache
1131+
with:
1132+
path: C:\Program Files\AMD\ROCm
1133+
key: rocm-${{ env.HIPSDK_INSTALLER_VERSION }}-${{ runner.os }}
1134+
1135+
- name: Setup ROCm
1136+
if: steps.cache-rocm.outputs.cache-hit != 'true'
1137+
uses: ./.github/actions/linux-setup-spacemit
1138+
with:
1139+
version: ${{ env.HIPSDK_INSTALLER_VERSION }}
11151140

11161141
- name: Verify ROCm
11171142
id: verify

0 commit comments

Comments
 (0)