minor CI fixes

This commit is contained in:
NiccoloN
2026-03-23 19:43:50 +01:00
parent a1b29dffe0
commit f2d593f749
5 changed files with 24 additions and 24 deletions

View File

@@ -12,7 +12,7 @@ inputs:
runs: runs:
using: composite using: composite
steps: steps:
- name: Restore MLIR cache - name: Restore MLIR Cache
id: restore-mlir-cache id: restore-mlir-cache
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
@@ -46,7 +46,7 @@ runs:
-DCMAKE_MODULE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}" -DCMAKE_MODULE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}"
cmake --build onnx-mlir/llvm-project/build cmake --build onnx-mlir/llvm-project/build
- name: Save MLIR cache - name: Save MLIR Cache
if: steps.restore-mlir-cache.outputs.cache-hit != 'true' if: steps.restore-mlir-cache.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:

View File

@@ -1,8 +1,8 @@
name: Prepare Protobuf Cache name: Prepare Protobuf Cache
description: Restore or build the cached protobuf installation. description: Restore or build the cached Protobuf installation.
inputs: inputs:
protobuf-commit: protobuf-ref:
description: Protobuf tag or commit to build. description: Protobuf tag or commit to build.
required: true required: true
mold-linker-flags: mold-linker-flags:
@@ -12,20 +12,20 @@ inputs:
runs: runs:
using: composite using: composite
steps: steps:
- name: Restore protobuf cache - name: Restore Protobuf Cache
id: restore-protobuf-cache id: restore-protobuf-cache
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
path: | path: |
/usr/local/lib/libproto* /usr/local/lib/libproto*
/usr/local/include/google/protobuf /usr/local/include/google/protobuf
key: protobuf-${{ runner.os }}-${{ inputs.protobuf-commit }} key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}
- name: Install protobuf - name: Install Protobuf
if: steps.restore-protobuf-cache.outputs.cache-hit != 'true' if: steps.restore-protobuf-cache.outputs.cache-hit != 'true'
shell: bash shell: bash
run: | run: |
git clone --depth 1 --branch ${{ inputs.protobuf-commit }} https://github.com/protocolbuffers/protobuf git clone --depth 1 --branch ${{ inputs.protobuf-ref }} https://github.com/protocolbuffers/protobuf protobuf
cmake -S protobuf -B protobuf/build -G Ninja \ cmake -S protobuf -B protobuf/build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_EXE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}" \ -DCMAKE_EXE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}" \
@@ -35,11 +35,11 @@ runs:
sudo cmake --install protobuf/build sudo cmake --install protobuf/build
rm -rf protobuf rm -rf protobuf
- name: Save protobuf cache - name: Save Protobuf Cache
if: steps.restore-protobuf-cache.outputs.cache-hit != 'true' if: steps.restore-protobuf-cache.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: | path: |
/usr/local/lib/libproto* /usr/local/lib/libproto*
/usr/local/include/google/protobuf /usr/local/include/google/protobuf
key: protobuf-${{ runner.os }}-${{ inputs.protobuf-commit }} key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}

View File

@@ -1,5 +1,5 @@
name: Restore Raptor Build Cache name: Restore Raptor Build Cache
description: Restore the cached raptor build directory for incremental builds. description: Restore the cached Raptor build directory for incremental builds.
inputs: inputs:
key: key:
@@ -17,7 +17,7 @@ outputs:
runs: runs:
using: composite using: composite
steps: steps:
- name: Restore raptor build cache - name: Restore Raptor Build Cache
id: restore-raptor-build-cache id: restore-raptor-build-cache
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:

View File

@@ -1,5 +1,5 @@
name: Save Raptor Build Cache name: Save Raptor Build Cache
description: Save the raptor build directory after a successful incremental build. description: Save the Raptor build directory after a successful incremental build.
inputs: inputs:
key: key:
@@ -9,7 +9,7 @@ inputs:
runs: runs:
using: composite using: composite
steps: steps:
- name: Save raptor build cache - name: Save Raptor Build Cache
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: build path: build

View File

@@ -2,7 +2,7 @@ name: Validate Operations
env: env:
LLVM_COMMIT: 0c2701fe7fa002e1befc5f86c268a7964f96d286 LLVM_COMMIT: 0c2701fe7fa002e1befc5f86c268a7964f96d286
PROTOBUF_COMMIT: v34.0 PROTOBUF_REF: v34.0
CMAKE_VERSION: 4.3.0 CMAKE_VERSION: 4.3.0
MOLD_LINKER_FLAGS: -fuse-ld=mold MOLD_LINKER_FLAGS: -fuse-ld=mold
@@ -43,16 +43,16 @@ jobs:
cmake --version cmake --version
which cmake which cmake
- name: Prepare MLIR cache - name: Prepare MLIR Cache
uses: ./.github/actions/prepare-mlir-cache uses: ./.github/actions/prepare-mlir-cache
with: with:
llvm-commit: ${{ env.LLVM_COMMIT }} llvm-commit: ${{ env.LLVM_COMMIT }}
mold-linker-flags: ${{ env.MOLD_LINKER_FLAGS }} mold-linker-flags: ${{ env.MOLD_LINKER_FLAGS }}
- name: Prepare protobuf cache - name: Prepare Protobuf Cache
uses: ./.github/actions/prepare-protobuf-cache uses: ./.github/actions/prepare-protobuf-cache
with: with:
protobuf-commit: ${{ env.PROTOBUF_COMMIT }} protobuf-ref: ${{ env.PROTOBUF_REF }}
mold-linker-flags: ${{ env.MOLD_LINKER_FLAGS }} mold-linker-flags: ${{ env.MOLD_LINKER_FLAGS }}
- name: Register installed libraries - name: Register installed libraries
@@ -69,14 +69,14 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: pip install numpy onnx colorama run: pip install numpy onnx colorama
- name: Restore raptor build cache - name: Restore Raptor Build Cache
id: restore-raptor-build-cache id: restore-raptor-build-cache
uses: ./.github/actions/restore-raptor-build-cache uses: ./.github/actions/restore-raptor-build-cache
with: with:
key: raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_COMMIT }}-${{ env.CMAKE_VERSION }}-${{ github.sha }} key: raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_REF }}-${{ env.CMAKE_VERSION }}-${{ github.sha }}
restore-keys: | restore-keys: |
raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_COMMIT }}-${{ env.CMAKE_VERSION }}- raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_REF }}-${{ env.CMAKE_VERSION }}-
raptor-build-${{ runner.os }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_COMMIT }}-${{ env.CMAKE_VERSION }}- raptor-build-${{ runner.os }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_REF }}-${{ env.CMAKE_VERSION }}-
- name: Build Raptor - name: Build Raptor
id: build-raptor id: build-raptor
@@ -92,11 +92,11 @@ jobs:
-DCMAKE_MODULE_LINKER_FLAGS="${MOLD_LINKER_FLAGS}" -DCMAKE_MODULE_LINKER_FLAGS="${MOLD_LINKER_FLAGS}"
cmake --build build cmake --build build
- name: Save raptor build cache - name: Save Raptor Build Cache
if: steps.build-raptor.outcome == 'success' && steps.restore-raptor-build-cache.outputs.cache-hit != 'true' if: steps.build-raptor.outcome == 'success' && steps.restore-raptor-build-cache.outputs.cache-hit != 'true'
uses: ./.github/actions/save-raptor-build-cache uses: ./.github/actions/save-raptor-build-cache
with: with:
key: raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_COMMIT }}-${{ env.CMAKE_VERSION }}-${{ github.sha }} key: raptor-build-${{ runner.os }}-${{ github.ref_name }}-${{ env.LLVM_COMMIT }}-${{ env.PROTOBUF_REF }}-${{ env.CMAKE_VERSION }}-${{ github.sha }}
- name: Run validation - name: Run validation
run: | run: |