Skip to content

Commit

Permalink
Remove remaining xtask actions.
Browse files Browse the repository at this point in the history
They're replaced by justfile equivalents.

I used a fairly quick and simple approach to find cargo workspace files
to operate on. We could improve on it, but I assume that it will be
removed soon.

Fixed: b/348023055

Change-Id: Ib2e09da59108852ae10af1255a46e642cb4c9ca6
  • Loading branch information
jblebrun committed Jul 22, 2024
1 parent acedfe7 commit 3282852
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 1,393 deletions.
250 changes: 0 additions & 250 deletions .xtask_bash_completion

This file was deleted.

37 changes: 0 additions & 37 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ members = [
"stage0",
"stage0_dice",
"testing/oak_echo_service",
"xtask",
"oak_restricted_kernel_sdk_proc_macro",
]
exclude = [
Expand Down Expand Up @@ -145,7 +144,6 @@ oak_simple_io = { path = "./oak_simple_io" }
oak_tdx_guest = { path = "./oak_tdx_guest" }
oak_virtio = { path = "./oak_virtio" }
sev_serial = { path = "./sev_serial" }
xtask = { path = "./xtask" }
# Common external crates.
prost = { version = "*", default-features = false, features = ["prost-derive"] }
prost-build = "*"
Expand Down
5 changes: 2 additions & 3 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ are squashed against the correct commit if necessary.

## Style Guide

Before submitting your PR, we ask you to run
`./scripts/docker_run ./scripts/xtask format`, which formats code & docs
according to our style guide.
Before submitting your PR, we ask you to run `just format`, which formats code &
docs according to our style guide.

### Rust

Expand Down
8 changes: 0 additions & 8 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,6 @@ above):
-----------------------
```

## xtask

`xtask` is a utility binary to perform a number of common tasks within the Oak
repository. It can be run by invoking `./scripts/xtask` from the root of the
repository, and it has a number of flags and sub-commands available, which
should be self-explanatory, and it also supports flag autocompletion when
invoked from inside a Nix shell.

## Run Oak Functions Examples

Running the integration tests for Oak Functions will confirm that all core
Expand Down
22 changes: 0 additions & 22 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,6 @@
};
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
src = ./.;
# Build xtask as a package so that we can use it in the devShell and cache it in the
# future, without rebuilding it every time.
xtask = craneLib.buildPackage {
inherit src;
pname = "xtask";
version = "0.1.0";
cargoExtraArgs = "--package=xtask";
buildInputs = [
pkgs.protobuf
];
};
# Build the dependencies of xtask as a package so that we can use it in the devShell and
# cache it in the future, without rebuilding it every time.
cargoDeps = craneLib.buildDepsOnly {
inherit src;
pname = "cargodeps";
version = "0.1.0";
cargoExtraArgs = "--package=xtask";
};
in
{
packages = { inherit linux_kernel; inherit vanilla_linux_kernel; };
Expand All @@ -123,9 +104,6 @@
ps
which
];
shellHook = ''
source .xtask_bash_completion
'';
};
# Minimal shell with only the dependencies needed to run the Rust tests.
rust = with pkgs; mkShell {
Expand Down
Loading

0 comments on commit 3282852

Please sign in to comment.