Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-${{ matrix.toolchain }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-${{ matrix.toolchain }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-${{ matrix.toolchain }}-${{ runner.os }}-${{ runner.arch }}-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler sources
Expand Down Expand Up @@ -415,7 +415,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -527,7 +527,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler sources
Expand Down Expand Up @@ -563,7 +563,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -639,7 +639,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down Expand Up @@ -823,7 +823,7 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'src/oven/fixtures/release_stdlib.toml') }}
key: incan-oven-pr-sources-v1-1.98.0-Linux-X64-${{ hashFiles('Cargo.lock', 'crates/incan_stdlib/stdlib/components/**/vocab_companion/Cargo.lock', 'tests/fixtures/oven_loaf_dependencies/Cargo.lock', 'loaves/oven/oven_rustc/src/fixtures/release_stdlib.toml') }}
restore-keys: |
incan-oven-pr-sources-v1-1.98.0-Linux-X64-
- name: Fetch locked compiler and Loaf publisher sources
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/oven_evidence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ jobs:
--rustc "$(rustup which --toolchain '${{ matrix.toolchain }}' rustc)" \
--checkout-revision "$GITHUB_SHA" \
--workload build \
--source "$GITHUB_WORKSPACE/src/oven/fixtures/release_core.incn" \
--clean-worktree-source "$clean_worktree/src/oven/fixtures/release_core.incn" \
--source "$GITHUB_WORKSPACE/loaves/oven/oven_rustc/src/fixtures/release_core.incn" \
--clean-worktree-source "$clean_worktree/loaves/oven/oven_rustc/src/fixtures/release_core.incn" \
--incan-home "$RUNNER_TEMP/incan-oven-alpha-benchmark-home" \
--output "$GITHUB_WORKSPACE/target/oven-alpha-benchmark" \
--cargo-guard-dir "$guard" \
Expand Down
34 changes: 34 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ members = [
"loaves/compiler/incan_frontend",
"loaves/compiler/incan_ir",
"loaves/oven/oven_model",
"loaves/oven/oven_rustc",
"loaves/oven/oven_store",
]
exclude = ["target/incan"]
resolver = "2"
Expand Down Expand Up @@ -132,6 +134,8 @@ hmac = { version = "0.12", features = ["reset"] }
hex = "0.4.3"
semver = "1.0.27"
oven_model = { path = "loaves/oven/oven_model" }
oven_rustc = { path = "loaves/oven/oven_rustc" }
oven_store = { path = "loaves/oven/oven_store" }
globset = "0.4.18"
# Safe, capability-oriented filesystem primitives for no-replace Oven publications.
rustix = { version = "1.1.4", features = ["fs"] }
Expand Down Expand Up @@ -181,6 +185,8 @@ incan_stdlib = { path = "crates/incan_stdlib" }
incan_frontend = { path = "loaves/compiler/incan_frontend", default-features = false, features = ["test_support"] }
incan_emit = { path = "loaves/compiler/incan_emit", default-features = false, features = ["test_support"] }
rust_inspect = { path = "crates/rust_inspect", default-features = false, features = ["test_fixtures"] }
oven_rustc = { path = "loaves/oven/oven_rustc", features = ["test_support"] }
oven_store = { path = "loaves/oven/oven_store", features = ["test_support"] }
tempfile = "3"
wat = "1"

Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ test-prewarm-oven-release-loafs: test-prewarm-sdk
.PHONY: test-oven-focused
test-oven-focused:
@echo "\033[1mRunning focused Oven and Loaf regression tests...\033[0m"
@CARGO_PROFILE_TEST_DEBUG=0 cargo test --locked -p oven_model -p oven_store -p oven_rustc
@CARGO_PROFILE_TEST_DEBUG=0 cargo test --locked --lib oven::
@CARGO_PROFILE_TEST_DEBUG=0 cargo test --locked --test cli_interop_target_tests \
lock_records_oven_interop_requirements_and_detects_input_drift -- --exact
Expand Down Expand Up @@ -577,8 +578,8 @@ test-oven-release-smoke: test-prewarm-oven-release-loafs
if [ -n "$$test_source" ]; then (cd "$$project_root" && run_project_incan test "$$test_source"); fi; \
done; \
for command in build run test; do \
source="$(CURDIR)/src/oven/fixtures/release_core.incn"; \
if [ "$$command" = test ]; then source="$(CURDIR)/src/oven/fixtures/test_release_core.incn"; fi; \
source="$(CURDIR)/loaves/oven/oven_rustc/src/fixtures/release_core.incn"; \
if [ "$$command" = test ]; then source="$(CURDIR)/loaves/oven/oven_rustc/src/fixtures/test_release_core.incn"; fi; \
run_incan "$$command" "$$source"; \
done; \
test ! -s "$$smoke_root/cargo-guard/invocations.log"
Expand Down
Loading
Loading