Skip to content

Commit ce062a1

Browse files
Merge branch 'main' into w-trace-dump
2 parents 483f75b + 16b329a commit ce062a1

File tree

14 files changed

+864
-762
lines changed

14 files changed

+864
-762
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
merge_group:
88
types: [checks_requested]
99

10+
env:
11+
CAIRO_NATIVE_REF: 6a4efafa26d6a0424dee593d2091206c6e9f428d
12+
1013
concurrency:
1114
group: ${{ github.workflow }}-${{ github.ref }}
1215
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
@@ -19,7 +22,6 @@ jobs:
1922
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/
2023
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/
2124
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/
22-
CAIRO_NATIVE_RUNTIME_LIBRARY: libcairo_native_runtime.a
2325
steps:
2426
- uses: actions/checkout@v4
2527
- uses: dtolnay/[email protected]
@@ -103,7 +105,7 @@ jobs:
103105
- name: Install LLVM
104106
run: sudo apt-get install llvm-19 llvm-19-dev llvm-19-runtime clang-19 clang-tools-19 lld-19 libpolly-19-dev libmlir-19-dev mlir-19-tools
105107
- name: Machete
106-
uses: bnjbvr/cargo-machete@main
108+
uses: bnjbvr/cargo-machete@v0.7.0
107109

108110
test:
109111
name: test (linux, amd64)
@@ -153,7 +155,7 @@ jobs:
153155
uses: actions/checkout@v4
154156
with:
155157
repository: lambdaclass/cairo_native
156-
ref: 76e83965d3bf1252eb6c68200a3accd5fd1ec004
158+
ref: ${{ env.CAIRO_NATIVE_REF }}
157159
path: cairo_native
158160
- name: Build Cairo Native Runtime Library
159161
shell: bash
@@ -162,7 +164,7 @@ jobs:
162164
make runtime
163165
echo "CAIRO_NATIVE_RUNTIME_LIBRARY=$(pwd)/libcairo_native_runtime.a" > $GITHUB_ENV
164166
- name: Test
165-
run: cargo test --all-features
167+
run: cargo test
166168

167169
test_macos:
168170
name: Test (macOS, Apple silicon)
@@ -190,12 +192,12 @@ jobs:
190192
uses: actions/checkout@v4
191193
with:
192194
repository: lambdaclass/cairo_native
193-
ref: 76e83965d3bf1252eb6c68200a3accd5fd1ec004
195+
ref: ${{ env.CAIRO_NATIVE_REF }}
194196
path: cairo_native
195197
- name: Build Cairo Native Runtime Library
196198
run: |
197199
cd cairo_native
198200
make runtime
199201
echo "CAIRO_NATIVE_RUNTIME_LIBRARY=$(pwd)/libcairo_native_runtime.a" > $GITHUB_ENV
200202
- name: Test
201-
run: cargo test --all-features
203+
run: cargo test

0 commit comments

Comments
 (0)