Merge branch 'main' into add-ordering-to-nat-changeset

oxidecomputer · Feb 9, 2024 · c6b68ae · c6b68ae
2 parents 2f58649 + dcbc9cb
commit c6b68ae
Show file tree

Hide file tree

Showing 90 changed files with 6,213 additions and 1,538 deletions.
diff --git a/.envrc b/.envrc
@@ -6,7 +6,7 @@ PATH_add out/clickhouse
 PATH_add out/dendrite-stub/bin
 PATH_add out/mgd/root/opt/oxide/mgd/bin
 
-if nix flake show &> /dev/null
+if [ "$OMICRON_USE_FLAKE" = 1 ] && nix flake show &> /dev/null
 then
     use flake;
-fi
+fi
diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@e17a4e247d4a36441181d7758c499d97e1e006bd # v2
+        uses: taiki-e/install-action@717ed1cb83959ef327137c2f806e1d8597bfca9f # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -26,10 +26,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-12 ]
+        os: [ ubuntu-22.04, macos-14 ]
     steps:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
+      if: ${{ startsWith(matrix.os, 'ubuntu') }}
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:

diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,6 @@ README.html
 TODO.html
 logs
 out
-tools/clickhouse*
-tools/cockroach*
 /clickhouse/
 /cockroachdb/
 smf/nexus/root.json