Skip to content

Commit cd1d8a0

Browse files
aaronmondalaaronmondal
committed
Factor out native Cargo CI
Remove a bunch of unnecessary CI runs and bring them in line with the pattern we're using for native Bazel builds and Nix builds.
1 parent ab0f1ac commit cd1d8a0

10 files changed

+155
-93
lines changed

‎.github/workflows/image.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@ jobs:
1717
packages: write
1818
id-token: write
1919
steps:
20+
2021
- name: Checkout
21-
uses: >- # v3.5.3
22-
actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
22+
uses: >- # v4.1.1
23+
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2324
2425
- name: Install Nix
2526
uses: >- # v7
2627
DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
2728
with:
2829
github-token: ${{ secrets.GITHUB_TOKEN }}
30+
2931
- name: Cache Nix derivations
3032
uses: >- # Custom commit, last pinned at 2023-11-17.
3133
DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
34+
3235
- name: Test image
3336
run: |
3437
nix run .#local-image-test

‎.github/workflows/main.yml

-48
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,6 @@ on:
88
branches: [ main ]
99

1010
jobs:
11-
windows-cargo-tests:
12-
# The type of runner that the job will run on.
13-
runs-on: windows-latest
14-
steps:
15-
- uses: actions/[email protected]
16-
with:
17-
fetch-depth: 0
18-
- name: Compile on windows
19-
run: cargo build --all
20-
- name: Test on windows
21-
run: cargo test --all
22-
cargo-tests:
23-
# The type of runner that the job will run on.
24-
runs-on: ubuntu-22.04
25-
strategy:
26-
matrix:
27-
# Which OS versions we will test on.
28-
os_version: [ 20.04, 22.04 ]
29-
steps:
30-
- uses: actions/[email protected]
31-
with:
32-
fetch-depth: 0
33-
34-
- uses: docker/setup-buildx-action@v2
35-
- uses: docker/build-push-action@v4
36-
with:
37-
context: .
38-
file: ./deployment-examples/docker-compose/Dockerfile
39-
build-args: |
40-
OS_VERSION=${{ matrix.os_version }}
41-
load: true # This brings the build into `docker images` from buildx.
42-
tags: trace_machina/native-link:dependencies
43-
target: dependencies
44-
45-
- name: Create container for cargo
46-
run: |
47-
docker run --name=native-link-cargo trace_machina/native-link:dependencies bash -c ' \
48-
DEBIAN_FRONTEND=noninteractive apt-get install -y curl libssl-dev gcc pkg-config python3 && \
49-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.70.0 \
50-
' && \
51-
docker commit native-link-cargo trace_machina/native-link:cargo
52-
- name: Compile & test with cargo
53-
run: |
54-
docker run --rm -w /root/native-link -v $PWD:/root/native-link trace_machina/native-link:cargo bash -c ' \
55-
. /root/.cargo/env && \
56-
cargo build --all && \
57-
cargo test --all \
58-
'
5911
docker-compose-compiles-native-link:
6012
# The type of runner that the job will run on.
6113
runs-on: ubuntu-22.04

‎.github/workflows/unit-test.yaml renamed to ‎.github/workflows/native-bazel.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Unit Tests
2+
name: Bazel Native
33

44
on:
55
push:
@@ -14,14 +14,17 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ubuntu-20.04, ubuntu-22.04, windows-2022]
17+
os: [macos-13, ubuntu-22.04, windows-2022]
1818
name: ${{ matrix.os }}
1919
runs-on: ${{ matrix.os }}
2020
steps:
21-
- uses: >- # v4.1.1
21+
22+
- name: Checkout
23+
uses: >- # v4.1.1
2224
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2325
24-
- uses: >- # Custom commit at 2023-10-23
26+
- name: Setup Bazelisk
27+
uses: >- # Custom commit at 2023-10-23
2528
bazelbuild/setup-bazelisk@5bc144ec07bd24eaa9b5c3e8c9af4006b033b629
2629
2730
- name: Determine Bazel cache mountpoint
@@ -42,7 +45,7 @@ jobs:
4245
actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
4346
with:
4447
path: ${{ steps.bazel-cache.outputs.mountpoint }}
45-
key: ${{ matrix.os }}-bazel-unit-test
48+
key: ${{ matrix.os }}-bazel-
4649

4750
- name: Run Bazel tests
4851
run: |

‎.github/workflows/native-cargo.yaml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
name: Cargo Native
3+
4+
on:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: [main]
9+
10+
permissions: read-all
11+
12+
jobs:
13+
cargo-native:
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os: [macos-13, ubuntu-22.04, windows-2022]
18+
toolchain: [stable, beta, nightly]
19+
name: ${{ matrix.os }} / ${{ matrix.toolchain }}
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
23+
- name: Checkout
24+
uses: >- # v4.1.1
25+
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
26+
27+
- name: Set up Rust toolchain
28+
run: |
29+
rustup update stable && rustup default stable
30+
shell: bash
31+
32+
- name: Set up Cargo cache
33+
uses: >- # v3.3.2
34+
actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
35+
with:
36+
path: |
37+
~/.cargo/bin/
38+
~/.cargo/registry/index/
39+
~/.cargo/registry/cache/
40+
~/.cargo/git/db/
41+
target/
42+
key: ${{ runner.os }}-cargo-native-${{ hashFiles('**/Cargo.lock') }}
43+
restore-keys: ${{ runner.os }}-cargo-
44+
45+
- name: Build on ${{ runner.os }}
46+
run: cargo build --all
47+
48+
- name: Test on ${{ runner.os }}
49+
run: cargo test --all

‎.github/workflows/nix.yaml

+39-27
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,59 @@ permissions: read-all
1111

1212
jobs:
1313
nix-bazel:
14-
runs-on: ubuntu-22.04
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os: [macos-13, ubuntu-22.04]
18+
name: Bazel Dev / ${{ matrix.os }}
19+
runs-on: ${{ matrix.os }}
1520
steps:
21+
1622
- name: Checkout
17-
uses: actions/[email protected]
18-
with:
19-
fetch-depth: 0
23+
uses: >- # v4.1.1
24+
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
25+
2026
- name: Install Nix
21-
uses: cachix/install-nix-action@v22
22-
with:
23-
nix_path: nixpkgs=channel:nixos-unstable
24-
- name: Mount Nix cache
25-
uses: actions/[email protected]
26-
with:
27-
key: ${{ runner.os }}-nix
28-
path: ~/nix
27+
uses: >- #v7
28+
DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
29+
30+
- name: Cache Nix derivations
31+
uses: >- # Custom commit, last pinned at 2023-11-17.
32+
DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
33+
2934
- name: Mount bazel cache
30-
uses: actions/cache@v3
35+
uses: >- # v3.3.2
36+
actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
3137
with:
3238
path: "~/.cache/bazel"
3339
key: ${{ runner.os }}-bazel-nix
40+
3441
- name: Invoke Bazel build in Nix shell
3542
run: >
36-
nix --store ~/nix develop --impure --command
43+
nix develop --impure --command
3744
bash -c "bazel test ..."
45+
3846
nix-cargo:
39-
runs-on: ubuntu-22.04
47+
strategy:
48+
fail-fast: false
49+
matrix:
50+
os: [ubuntu-22.04, macos-13]
51+
name: Cargo Dev / ${{ matrix.os }}
52+
runs-on: ${{ matrix.os }}
4053
steps:
4154
- name: Checkout
42-
uses: actions/[email protected]
43-
with:
44-
fetch-depth: 0
55+
uses: >- # v4.1.1
56+
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
57+
4558
- name: Install Nix
46-
uses: cachix/install-nix-action@v22
47-
with:
48-
nix_path: nixpkgs=channel:nixos-unstable
49-
- name: Mount Nix cache
50-
uses: actions/[email protected]
51-
with:
52-
key: ${{ runner.os }}-nix
53-
path: ~/nix
59+
uses: >- #v7
60+
DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
61+
62+
- name: Cache Nix derivations
63+
uses: >- # Custom commit, last pinned at 2023-11-17.
64+
DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
65+
5466
- name: Invoke Cargo build in Nix shell
5567
run: >
56-
nix --store ~/nix develop --impure --command
68+
nix develop --impure --command
5769
bash -c "cargo test --all"

‎Cargo.Bazel.lock

+28-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "23af5237f25c8c8d8b18e23ebbe5438fcbe890c9983d2b5a8d183f2de498fa5d",
2+
"checksum": "9d8ddaa95a4e20df6be7199ff8e40a18aa52cb04e2321784f413277f05bd92cb",
33
"crates": {
44
"addr2line 0.21.0": {
55
"name": "addr2line",
@@ -7201,6 +7201,11 @@
72017201
"default",
72027202
"std"
72037203
],
7204+
"x86_64-apple-darwin": [
7205+
"default",
7206+
"extra_traits",
7207+
"std"
7208+
],
72047209
"x86_64-unknown-linux-gnu": [
72057210
"default",
72067211
"std"
@@ -11719,6 +11724,10 @@
1171911724
"default",
1172011725
"use-libc-auxv"
1172111726
],
11727+
"x86_64-apple-darwin": [
11728+
"default",
11729+
"use-libc-auxv"
11730+
],
1172211731
"x86_64-unknown-linux-gnu": [
1172311732
"default",
1172411733
"use-libc-auxv"
@@ -17451,7 +17460,8 @@
1745117460
"x86_64-unknown-linux-gnu"
1745217461
],
1745317462
"cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = \"linux\", target_endian = \"little\", any(target_arch = \"arm\", all(target_arch = \"aarch64\", target_pointer_width = \"64\"), target_arch = \"riscv64\", all(rustix_use_experimental_asm, target_arch = \"powerpc64\"), all(rustix_use_experimental_asm, target_arch = \"mips\"), all(rustix_use_experimental_asm, target_arch = \"mips32r6\"), all(rustix_use_experimental_asm, target_arch = \"mips64\"), all(rustix_use_experimental_asm, target_arch = \"mips64r6\"), target_arch = \"x86\", all(target_arch = \"x86_64\", target_pointer_width = \"64\")))))))": [
17454-
"aarch64-apple-darwin"
17463+
"aarch64-apple-darwin",
17464+
"x86_64-apple-darwin"
1745517465
],
1745617466
"cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": [],
1745717467
"cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": [
@@ -17480,19 +17490,22 @@
1748017490
"cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": [
1748117491
"aarch64-apple-darwin",
1748217492
"aarch64-unknown-linux-gnu",
17493+
"x86_64-apple-darwin",
1748317494
"x86_64-pc-windows-msvc",
1748417495
"x86_64-unknown-linux-gnu"
1748517496
],
1748617497
"cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))": [
1748717498
"aarch64-apple-darwin",
1748817499
"aarch64-unknown-linux-gnu",
17500+
"x86_64-apple-darwin",
1748917501
"x86_64-pc-windows-msvc",
1749017502
"x86_64-unknown-linux-gnu"
1749117503
],
1749217504
"cfg(any(target_arch = \"x86\", target_arch = \"x86_64\", all(any(target_arch = \"aarch64\", target_arch = \"arm\"), any(target_os = \"android\", target_os = \"fuchsia\", target_os = \"linux\", target_os = \"windows\"))))": [
1749317505
"aarch64-unknown-linux-gnu",
1749417506
"arm-unknown-linux-gnueabi",
1749517507
"armv7-unknown-linux-gnueabi",
17508+
"x86_64-apple-darwin",
1749617509
"x86_64-pc-windows-msvc",
1749717510
"x86_64-unknown-linux-gnu"
1749817511
],
@@ -17501,20 +17514,23 @@
1750117514
"aarch64-unknown-linux-gnu",
1750217515
"arm-unknown-linux-gnueabi",
1750317516
"armv7-unknown-linux-gnueabi",
17517+
"x86_64-apple-darwin",
1750417518
"x86_64-unknown-linux-gnu"
1750517519
],
1750617520
"cfg(any(unix, target_os = \"wasi\"))": [
1750717521
"aarch64-apple-darwin",
1750817522
"aarch64-unknown-linux-gnu",
1750917523
"arm-unknown-linux-gnueabi",
1751017524
"armv7-unknown-linux-gnueabi",
17525+
"x86_64-apple-darwin",
1751117526
"x86_64-unknown-linux-gnu"
1751217527
],
1751317528
"cfg(any(windows, unix, target_os = \"redox\"))": [
1751417529
"aarch64-apple-darwin",
1751517530
"aarch64-unknown-linux-gnu",
1751617531
"arm-unknown-linux-gnueabi",
1751717532
"armv7-unknown-linux-gnueabi",
17533+
"x86_64-apple-darwin",
1751817534
"x86_64-pc-windows-msvc",
1751917535
"x86_64-unknown-linux-gnu"
1752017536
],
@@ -17524,6 +17540,7 @@
1752417540
"aarch64-unknown-linux-gnu",
1752517541
"arm-unknown-linux-gnueabi",
1752617542
"armv7-unknown-linux-gnueabi",
17543+
"x86_64-apple-darwin",
1752717544
"x86_64-pc-windows-msvc",
1752817545
"x86_64-unknown-linux-gnu"
1752917546
],
@@ -17532,13 +17549,15 @@
1753217549
"aarch64-unknown-linux-gnu",
1753317550
"arm-unknown-linux-gnueabi",
1753417551
"armv7-unknown-linux-gnueabi",
17552+
"x86_64-apple-darwin",
1753517553
"x86_64-unknown-linux-gnu"
1753617554
],
1753717555
"cfg(not(target_family = \"wasm\"))": [
1753817556
"aarch64-apple-darwin",
1753917557
"aarch64-unknown-linux-gnu",
1754017558
"arm-unknown-linux-gnueabi",
1754117559
"armv7-unknown-linux-gnueabi",
17560+
"x86_64-apple-darwin",
1754217561
"x86_64-pc-windows-msvc",
1754317562
"x86_64-unknown-linux-gnu"
1754417563
],
@@ -17547,11 +17566,13 @@
1754717566
"aarch64-unknown-linux-gnu",
1754817567
"arm-unknown-linux-gnueabi",
1754917568
"armv7-unknown-linux-gnueabi",
17569+
"x86_64-apple-darwin",
1755017570
"x86_64-unknown-linux-gnu"
1755117571
],
1755217572
"cfg(target_os = \"hermit\")": [],
1755317573
"cfg(target_os = \"macos\")": [
17554-
"aarch64-apple-darwin"
17574+
"aarch64-apple-darwin",
17575+
"x86_64-apple-darwin"
1755517576
],
1755617577
"cfg(target_os = \"redox\")": [],
1755717578
"cfg(target_os = \"wasi\")": [],
@@ -17565,12 +17586,16 @@
1756517586
"aarch64-unknown-linux-gnu",
1756617587
"arm-unknown-linux-gnueabi",
1756717588
"armv7-unknown-linux-gnueabi",
17589+
"x86_64-apple-darwin",
1756817590
"x86_64-unknown-linux-gnu"
1756917591
],
1757017592
"cfg(windows)": [
1757117593
"x86_64-pc-windows-msvc"
1757217594
],
1757317595
"i686-pc-windows-gnu": [],
17596+
"x86_64-apple-darwin": [
17597+
"x86_64-apple-darwin"
17598+
],
1757417599
"x86_64-pc-windows-gnu": [],
1757517600
"x86_64-pc-windows-gnullvm": [],
1757617601
"x86_64-pc-windows-msvc": [

0 commit comments

Comments
 (0)