Skip to content
Open
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
27 changes: 27 additions & 0 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This file contains settings for `cargo hakari`.
# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.

hakari-package = "workspace-hack"

# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
dep-format-version = "4"

# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended.
# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from
# hakari's perspective, so you're welcome to set either.)
#
# For more about the new feature resolver, see:
# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
resolver = "3"

# Add triples corresponding to platforms commonly used by developers here.
# https://doc.rust-lang.org/rustc/platform-support.html
platforms = [
"x86_64-unknown-linux-gnu",
# "x86_64-apple-darwin",
# "aarch64-apple-darwin",
# "x86_64-pc-windows-msvc",
]

# Write out exact versions rather than a semver range. (Defaults to false.)
# exact-versions = true
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks
# Cargo.
Cargo.lock merge=binary
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98

# c.f. https://github.com/extractions/setup-just/issues/23
- uses: extractions/setup-crate@4993624604c307fbca528d28a3c8b60fa5ecc859 # v1.4.0
with:
repo: casey/just
version: 1.42.4
- uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: cargo-nextest, cargo-insta@1.28.0
- uses: ./.github/actions/setup-nix-direnv-rust
- run: just test-unit
test-integration:
name: Integration test (& build all in dev-mode)
Expand Down
11 changes: 4 additions & 7 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: "Opsqueue CI"

agent:
machine:
type: "f1-standard-2"
os_image: "ubuntu2204"
type: "f1-standard-4"
os_image: "ubuntu2404"

# If we push a new build to some branch that isn't master, and another build is
# already running, we cancel it.
Expand Down Expand Up @@ -60,17 +60,14 @@ blocks:
when: "branch = 'master'"
task:
jobs:
- name: "Build Opsqueue binary (in release mode) & run unit tests"
- name: "Build Opsqueue binary & Python library (in release mode) & run unit tests"
commands:
- "nix-store -qR --include-outputs $(nix-store -qd $(just nix-build-bin)) | grep -v '\\.drv$' | cachix push channable"
- "nix-store -qR --include-outputs $(nix-store -qd $(just nix-build)) | grep -v '\\.drv$' | cachix push channable"
# Once a day, we update the devenv cache.
# Except when fresh, this takes < 1 second
# but it cannot live in the prologue
# as that might corrupt it
- cache store nix-store-$(date -u -Idate) /nix
- name: "Build Python library (in release mode)"
commands:
- "nix-store -qR --include-outputs $(nix-store -qd $(just nix-build-python)) | grep -v '\\.drv$' | cachix push channable"
- name: "Integration"
dependencies:
- "Build"
Expand Down
Loading
Loading