Feature/caddy

.github/workflows/gg.yml

@@ -142,6 +142,9 @@ jobs:
             target: x86_64-apple-darwin
             stage4: x86_64-apple-darwin
             # TODO: Version too new
+          - os: macos-12
+            target: x86_64-apple-darwin
+            stage4: x86_64-apple-darwin
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
             stage4: x86_64-unknown-linux-musl
@@ -252,7 +255,7 @@ jobs:
     needs: stage1
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022, macOS-11, macOS-12 ]
+        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" ]
 
     runs-on: ${{ matrix.os }}
@@ -341,7 +344,7 @@ jobs:
     needs: stage1
     strategy:
       matrix:
-        container: [ ubuntu, debian, alpine, archlinux, 'ubuntu:14.04', 'ubuntu:18.04' ]
+        container: [ ubuntu, debian, alpine, archlinux ]
         cmd: [ "node@14 -v", "java -version", "gradle -version", "maven -v", "openapi version", "rat -V", "run:java@14 java -version" ]
 
     runs-on: ubuntu-latest

src/stage4/src/executor.rs

@@ -13,7 +13,7 @@ use semver::{Version, VersionReq};
 use serde::{Deserialize, Serialize};
 use which::which_in;
 use crate::bloody_indiana_jones::BloodyIndianaJones;
-
+use crate::executors::caddy::Caddy;
 use crate::executors::custom_command::CustomCommand;
 use crate::executors::deno::Deno;
 use crate::executors::go::Go;
@@ -151,6 +151,7 @@ impl dyn Executor {
             "run" => Some(Box::new(CustomCommand { executor_cmd })),
             "deno" => Some(Box::new(Deno { executor_cmd })),
             "go" => Some(Box::new(Go { executor_cmd })),
+            "caddy" => Some(Box::new(Caddy { executor_cmd })),
             _ => None,
         }
     }

src/stage4/src/executors/caddy.rs

@@ -0,0 +1,73 @@
+use std::collections::HashSet;
+use std::future::Future;
+use std::pin::Pin;
+
+use crate::executor::{AppInput, Download, Executor, ExecutorCmd, GgVersion};
+use crate::target::{Arch, Os, Variant};
+use crate::target::Os::Windows;
+
+pub struct Caddy {
+    pub executor_cmd: ExecutorCmd,
+}
+
+impl Executor for Caddy {
+    fn get_executor_cmd(&self) -> &ExecutorCmd {
+        &self.executor_cmd
+    }
+
+    fn get_download_urls<'a>(&self, _input: &'a AppInput) -> Pin<Box<dyn Future<Output=Vec<Download>> + 'a>> {
+        Box::pin(async move {
+            let mut downloads: Vec<Download> = vec!();
+            let octocrab = octocrab::Octocrab::builder().base_uri("https://ghapi.ggcmd.io/").unwrap().build().unwrap();
+            let mut page: u32 = 1;
+            loop {
+                let releases = octocrab.repos("caddyserver", "caddy")
+                    .releases().list().page(page).per_page(100).send().await.unwrap();
+                for release in releases.items {
+                    for asset in release.assets {
+                        let os = if asset.name.contains("windows") {
+                            Some(Windows)
+                        } else if asset.name.contains("linux") {
+                            Some(Os::Linux)
+                        } else if asset.name.contains("apple") {
+                            Some(Os::Mac)
+                        } else {
+                            None
+                        };
+                        let arch = if asset.name.contains("amd64") {
+                            Some(Arch::X86_64)
+                        } else {
+                            None
+                        };
+                        if os.is_some() && arch.is_some() {
+                            downloads.push(Download {
+                                download_url: asset.browser_download_url.to_string(),
+                                version: GgVersion::new(release.tag_name.as_str()),
+                                os,
+                                arch,
+                                tags: HashSet::new(),
+                                variant: Some(Variant::Any),
+                            });
+                        }
+                    }
+                }
+                if releases.next == None {
+                    break;
+                }
+                page += 1;
+            }
+            downloads
+        })
+    }
+
+    fn get_bins(&self, input: &AppInput) -> Vec<String> {
+        vec!(match &input.target.os {
+            Windows => "caddy.exe",
+            _ => "caddy"
+        }.to_string())
+    }
+
+    fn get_name(&self) -> &str {
+        "caddy"
+    }
+}

src/stage4/src/executors/deno.rs

@@ -18,7 +18,7 @@ impl Executor for Deno {
     fn get_download_urls<'a>(&self, _input: &'a AppInput) -> Pin<Box<dyn Future<Output=Vec<Download>> + 'a>> {
         Box::pin(async move {
             let mut downloads: Vec<Download> = vec!();
-            let octocrab = octocrab::Octocrab::builder().base_uri("https://ggcmddenogithubreleases.azureedge.net/").unwrap().build().unwrap();
+            let octocrab = octocrab::Octocrab::builder().base_uri("https://ghapi.ggcmd.io/").unwrap().build().unwrap();
             let mut page: u32 = 1;
             loop {
                 let releases = octocrab.repos("denoland", "deno")

src/stage4/src/executors/java.rs

@@ -26,7 +26,6 @@ struct Root2 {
     pub features: Vec<String>,
     #[serde(rename = "hw_bitness")]
     pub hw_bitness: String,
-    pub id: i64,
     #[serde(rename = "java_version")]
     pub java_version: Vec<i64>,
     pub javafx: bool,

src/stage4/src/executors/mod.rs

@@ -8,3 +8,4 @@ pub mod node;
 pub mod deno;
 pub mod gradle_properties;
 pub mod go;
+pub mod caddy;