Merge branch 'main' into awick/static-client-certs

fastly · Jul 12, 2024 · db5062c · db5062c
2 parents 92bb073 + 6c2aff6
commit db5062c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ jobs:
         exclude:
           - os: windows-2022
             arch: arm64
-          - os: macos-14
-            arch: amd64
         include:
           - os: ubuntu-24.04
             name: linux

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
   point to certificate/key files on disk, whereas the non-"_file" variants should be
   multi-line string constants in the toml. In all cases, they should be in PEM format.
 
+## 0.10.1 (2024-07-11)
+
+- Revert a CI configuration change that inadvertently prevented builds being created for amd64 macOS endpoints ([#405](https://github.com/fastly/Viceroy/pull/405))
+
 ## 0.10.0 (2024-07-09)
 
 - Add `get_addr_dest_{ip,port}` hostcalls ([#402](https://github.com/fastly/Viceroy/pull/402))

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "viceroy"
 description = "Viceroy is a local testing daemon for Fastly Compute."
-version = "0.10.1"
+version = "0.10.2"
 authors = ["Fastly"]
 readme = "../README.md"
 edition = "2021"
@@ -45,7 +45,7 @@ tokio-rustls = { workspace = true }
 tracing = { workspace = true }
 tracing-futures = { workspace = true }
 tracing-subscriber = { version = "^0.3.16", features = ["env-filter", "fmt"] }
-viceroy-lib = { path = "../lib", version = "^0.10.1" }
+viceroy-lib = { path = "../lib", version = "^0.10.2" }
 wat = "^1.0.38"
 wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }

diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "viceroy-lib"
-version = "0.10.1"
+version = "0.10.2"
 description = "Viceroy implementation details."
 authors = ["Fastly"]
 edition = "2021"

diff --git a/test-fixtures/Cargo.lock b/test-fixtures/Cargo.lock