Skip to content

Commit

Permalink
update crit; fix port generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Pennebaker committed Jan 5, 2024
1 parent 6cfd584 commit d4686b3
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ peg = "0.8.1"
regex = "1.8.1"
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
tinyrick = { version = "^0.0.9", optional = true }
tinyrick_extras = { version = "^0.0.6", optional = true }
tinyrick = { version = "^0.0.13", optional = true }
tinyrick_extras = { version = "^0.0.7", optional = true }
walkdir = "2.3.3"

[features]
Expand Down
14 changes: 12 additions & 2 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
[target.x86_64-unknown-netbsd]
pre-build = [
"mkdir -p /tmp/netbsd",
"curl https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/amd64/binary/sets/base.tar.xz -O",
"tar -C /tmp/netbsd -xJf base.tar.xz",
"cp /tmp/netbsd/usr/lib/libexecinfo.so /usr/local/x86_64-unknown-netbsd/lib",
"rm base.tar.xz",
"rm -rf /tmp/netbsd",
]

[target.aarch64-apple-darwin]
image = "freeznet/aarch64-apple-darwin-cross:11.3"
image = "freeznet/aarch64-apple-darwin-cross:11.3.1"

[target.x86_64-apple-darwin]
image = "freeznet/x86_64-apple-darwin-cross:11.3"
image = "freeznet/x86_64-apple-darwin-cross:11.3.1"
5 changes: 4 additions & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# BUILDTIME REQUIREMENTS

* [rustup](https://rustup.rs/) 1.25.2+
* [Rust](https://www.rust-lang.org/en-US/) 1.68.2+
* [Rust](https://www.rust-lang.org/en-US/) 1.75.0+
* [Docker](https://www.docker.com/) 20.10.12+
* [zip](https://en.wikipedia.org/wiki/ZIP_(file_format))
* a POSIX compliant [make](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html) implementation (e.g. GNU make, BSD make, etc.)
* Provision additional dev tools with `make`

## Recommended

* a host capable of running musl/Linux containers (e.g. a GNU/Linux, musl/Linux, macOS, or Windows host)
* [Docker First Aid Kit](https://github.com/mcandre/docker-first-aid-kit)
* Apply `DOCKER_DEFAULT_PLATFORM` = `linux/amd64` environment variable
* [ASDF](https://asdf-vm.com/) 0.10 (run `asdf reshim` after provisioning)
* [direnv](https://direnv.net/) 2
* [cargo-cache](https://crates.io/crates/cargo-cache)
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ all:
rustfmt
cargo install --force \
cargo-audit \
crit@0.0.6 \
crit@0.0.7 \
cross@0.2.5 \
tinyrick@0.0.11
tinyrick@0.0.13
10 changes: 10 additions & 0 deletions sample.envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
#
# Install:
# cp sample.envrc .envrc
#
# Uninstall:
# rm .envrc

source_up
export DOCKER_DEFAULT_PLATFORM='linux/amd64'

0 comments on commit d4686b3

Please sign in to comment.