From b2a03bf87006a810de6655d4b0d800beb4984653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eirik=20Brandtz=C3=A6g?= Date: Sun, 14 Jul 2024 20:37:54 +0200 Subject: [PATCH 1/2] Caddy test --- .github/workflows/gg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gg.yml b/.github/workflows/gg.yml index 7ff820b..d283443 100644 --- a/.github/workflows/gg.yml +++ b/.github/workflows/gg.yml @@ -256,7 +256,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022, macOS-12 ] - cmd: [ "node -v", "java -version", "gradle -version", "maven -v", "openapi version", "rat -V", "run:java@14 java -version", "deno -V" ] + cmd: [ "node -v", "java -version", "gradle -version", "maven -v", "openapi version", "rat -V", "run:java@14 java -version", "deno -V", "caddy -v" ] runs-on: ${{ matrix.os }} steps: @@ -301,7 +301,7 @@ jobs: strategy: matrix: os: [ windows-2019, windows-2022 ] - cmd: [ "node -v", "java -version", "gradle -version", "maven -v", "openapi version", "rat -V", "run:java@14 java -version", "deno -V" ] + cmd: [ "node -v", "java -version", "gradle -version", "maven -v", "openapi version", "rat -V", "run:java@14 java -version", "deno -V", "caddy -v" ] runs-on: ${{ matrix.os }} steps: From a648a8a4d37a826b7ad5bdd864bb3c7b8ca1267e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eirik=20Brandtz=C3=A6g?= Date: Sun, 14 Jul 2024 20:48:55 +0200 Subject: [PATCH 2/2] Caddy test --- src/stage4/src/executors/caddy.rs | 2 +- src/stage4/src/main.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stage4/src/executors/caddy.rs b/src/stage4/src/executors/caddy.rs index 7f5e66d..e007a64 100644 --- a/src/stage4/src/executors/caddy.rs +++ b/src/stage4/src/executors/caddy.rs @@ -29,7 +29,7 @@ impl Executor for Caddy { Some(Windows) } else if asset.name.contains("linux") { Some(Os::Linux) - } else if asset.name.contains("apple") { + } else if asset.name.contains("mac") { Some(Os::Mac) } else { None diff --git a/src/stage4/src/main.rs b/src/stage4/src/main.rs index fe19790..4e403b4 100644 --- a/src/stage4/src/main.rs +++ b/src/stage4/src/main.rs @@ -63,6 +63,7 @@ Supported systems: deno run (any arbitrary command) go + caddy "); }