-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/compile-contracts
- Loading branch information
Showing
81 changed files
with
4,787 additions
and
3,307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ concurrency: | |
jobs: | ||
check: | ||
name: clippy | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
env: | ||
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/ | ||
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/ | ||
|
@@ -38,7 +38,7 @@ jobs: | |
|
||
fmt: | ||
name: rustfmt | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: dtolnay/[email protected] | ||
|
@@ -81,12 +81,11 @@ jobs: | |
|
||
# Check for unnecessary dependencies. | ||
udeps: | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
env: | ||
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/ | ||
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/ | ||
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/ | ||
RUSTUP_TOOLCHAIN: nightly # udeps needs nightly | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: dtolnay/rust-toolchain@master | ||
|
@@ -102,14 +101,12 @@ jobs: | |
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key | ||
- name: Install LLVM | ||
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 | ||
- name: "Download and run cargo-udeps" | ||
run: | | ||
wget -O - -c https://github.com/est31/cargo-udeps/releases/download/v0.1.50/cargo-udeps-v0.1.50-x86_64-unknown-linux-gnu.tar.gz | tar -xz | ||
cargo-udeps-*/cargo-udeps udeps --all-targets --all-features | ||
- name: Machete | ||
uses: bnjbvr/cargo-machete@main | ||
|
||
test: | ||
name: test (linux, amd64) | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
env: | ||
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/ | ||
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/ | ||
|
@@ -127,7 +124,7 @@ jobs: | |
sudo apt-get remove -y 'php.*' | ||
sudo apt-get remove -y '^dotnet-.*' | ||
sudo apt-get remove -y '^temurin-.*' | ||
sudo apt-get remove -y azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox powershell mono-devel | ||
sudo apt-get remove -y azure-cli microsoft-edge-stable google-chrome-stable firefox mono-devel | ||
sudo apt-get autoremove -y | ||
sudo apt-get clean | ||
df -h | ||
|
@@ -151,8 +148,6 @@ jobs: | |
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 | ||
- name: Install deps | ||
run: make deps | ||
- name: Build cairo-native-runtime library. | ||
run: cargo build --profile=ci --package=cairo-native-runtime | ||
- name: test | ||
run: make test-ci | ||
- name: test-cairo | ||
|
@@ -180,19 +175,17 @@ jobs: | |
- name: Install scarb | ||
uses: software-mansion/setup-scarb@v1 | ||
with: | ||
scarb-version: "2.8.2" | ||
scarb-version: "2.8.4" | ||
- name: Install deps | ||
run: make deps | ||
- name: Build cairo-native-runtime library. | ||
run: cargo build --profile=ci --package=cairo-native-runtime | ||
- name: Run tests | ||
run: make test-ci | ||
- name: test-cairo | ||
run: make test-cairo | ||
|
||
coverage: | ||
name: coverage | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
strategy: | ||
matrix: | ||
partition: [1, 2, 3, 4] | ||
|
@@ -206,7 +199,6 @@ jobs: | |
- partition: 4 | ||
output: lcov-4.info | ||
env: | ||
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse | ||
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/ | ||
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/ | ||
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/ | ||
|
@@ -223,7 +215,7 @@ jobs: | |
sudo apt-get remove -y 'php.*' | ||
sudo apt-get remove -y '^dotnet-.*' | ||
sudo apt-get remove -y '^temurin-.*' | ||
sudo apt-get remove -y azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox powershell mono-devel | ||
sudo apt-get remove -y azure-cli microsoft-edge-stable google-chrome-stable firefox mono-devel | ||
sudo apt-get autoremove -y | ||
sudo apt-get clean | ||
df -h | ||
|
@@ -251,20 +243,18 @@ jobs: | |
- name: Install scarb | ||
uses: software-mansion/setup-scarb@v1 | ||
with: | ||
scarb-version: "2.8.2" | ||
scarb-version: "2.8.4" | ||
- name: Install deps | ||
run: make deps | ||
- name: Build runtime and alexandria | ||
run: make runtime && make check-llvm && make needs-cairo2 && make build-alexandria | ||
- name: Build cairo-native-runtime library. | ||
run: export PATH=$HOME/.rustup/toolchains/stable-aarch64-apple-darwin/bin:$PATH && cargo build --profile=ci --package=cairo-native-runtime | ||
run: make runtime-ci && make check-llvm && make needs-cairo2 && make build-alexandria | ||
|
||
- name: Run tests and generate coverage partition ${{ matrix.partition }} | ||
run: cargo llvm-cov nextest --verbose --all-features --workspace --lcov --output-path ${{ matrix.output }} --partition count:${{ matrix.partition }}/4 | ||
run: cargo llvm-cov nextest --verbose --features=scarb --workspace --lcov --output-path ${{ matrix.output }} --partition count:${{ matrix.partition }}/4 | ||
|
||
- name: test and generate coverage corelib | ||
if: ${{ matrix.partition == '1' }} | ||
run: cargo llvm-cov nextest --verbose --all-features --lcov --output-path lcov-test.info run --bin cairo-native-test -- corelib | ||
run: cargo llvm-cov nextest --verbose --features=scarb --lcov --output-path lcov-test.info run --bin cairo-native-test -- corelib | ||
|
||
- name: save coverage data with corelib | ||
if: ${{ matrix.partition == '1' }} | ||
|
@@ -282,10 +272,9 @@ jobs: | |
name: coverage-data-${{ matrix.partition }} | ||
path: ./${{ matrix.output }} | ||
|
||
|
||
upload-coverage: | ||
name: Upload Coverage | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
needs: [coverage] | ||
steps: | ||
- name: Setup rust env | ||
|
@@ -328,7 +317,7 @@ jobs: | |
|
||
dockerfile: | ||
name: dockerfile (linux, amd64) | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-24.04 | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: check and free hdd space left | ||
|
@@ -341,7 +330,7 @@ jobs: | |
sudo apt-get remove -y 'php.*' | ||
sudo apt-get remove -y '^dotnet-.*' | ||
sudo apt-get remove -y '^temurin-.*' | ||
sudo apt-get remove -y azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox powershell mono-devel | ||
sudo apt-get remove -y azure-cli microsoft-edge-stable google-chrome-stable firefox mono-devel | ||
sudo apt-get autoremove -y | ||
sudo apt-get clean | ||
df -h | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.