Add major version specific extraction for linux

danger · Oct 15, 2024 · 1a31f8f · 1a31f8f
1 parent d5b1401
commit 1a31f8f
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 2 deletions.
diff --git a/DangerfileWithDependencies.swift → DangerTestWithDependencies/Dangerfile.swift b/DangerfileWithDependencies.swift → DangerTestWithDependencies/Dangerfile.swift
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,32 @@
 {
   "pins" : [
+    {
+      "identity" : "collectionconcurrencykit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git",
+      "state" : {
+        "revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95",
+        "version" : "0.2.0"
+      }
+    },
+    {
+      "identity" : "cryptoswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
+      "state" : {
+        "revision" : "678d442c6f7828def400a70ae15968aef67ef52d",
+        "version" : "1.8.3"
+      }
+    },
+    {
+      "identity" : "komondor",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/shibapm/Komondor",
+      "state" : {
+        "revision" : "dedffeaf42a1b52bf072a9dc47afb35000a8b265",
+        "version" : "1.1.4"
+      }
+    },
     {
       "identity" : "logger",
       "kind" : "remoteSourceControl",
@@ -18,6 +45,15 @@
         "version" : "0.13.0"
       }
     },
+    {
+      "identity" : "packageconfig",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/shibapm/PackageConfig.git",
+      "state" : {
+        "revision" : "58523193c26fb821ed1720dcd8a21009055c7cdb",
+        "version" : "1.1.3"
+      }
+    },
     {
       "identity" : "requestkit",
       "kind" : "remoteSourceControl",
@@ -27,6 +63,60 @@
         "version" : "3.3.0"
       }
     },
+    {
+      "identity" : "rocket",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/shibapm/Rocket",
+      "state" : {
+        "revision" : "32af356776108ee7289884874a0eb63ceacb9e5d",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "shellout",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/JohnSundell/ShellOut.git",
+      "state" : {
+        "revision" : "e1577acf2b6e90086d01a6d5e2b8efdaae033568",
+        "version" : "2.3.0"
+      }
+    },
+    {
+      "identity" : "sourcekitten",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/SourceKitten.git",
+      "state" : {
+        "revision" : "fd4df99170f5e9d7cf9aa8312aa8506e0e7a44e7",
+        "version" : "0.35.0"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "state" : {
+        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
+        "version" : "1.5.0"
+      }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
+      "state" : {
+        "revision" : "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
+        "version" : "1.17.5"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/swiftlang/swift-syntax",
+      "state" : {
+        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
+        "version" : "600.0.0-prerelease-2024-08-14"
+      }
+    },
     {
       "identity" : "swiftformat",
       "kind" : "remoteSourceControl",
@@ -36,6 +126,42 @@
         "version" : "0.54.3"
       }
     },
+    {
+      "identity" : "swiftlint",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Realm/SwiftLint",
+      "state" : {
+        "revision" : "168fb98ed1f3e343d703ecceaf518b6cf565207b",
+        "version" : "0.57.0"
+      }
+    },
+    {
+      "identity" : "swiftshell",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kareman/SwiftShell",
+      "state" : {
+        "revision" : "99680b2efc7c7dbcace1da0b3979d266f02e213c",
+        "version" : "5.1.0"
+      }
+    },
+    {
+      "identity" : "swiftytexttable",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git",
+      "state" : {
+        "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
+        "version" : "0.9.0"
+      }
+    },
+    {
+      "identity" : "swxmlhash",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/drmohundro/SWXMLHash.git",
+      "state" : {
+        "revision" : "a853604c9e9a83ad9954c7e3d2a565273982471f",
+        "version" : "7.0.2"
+      }
+    },
     {
       "identity" : "version",
       "kind" : "remoteSourceControl",
@@ -44,6 +170,15 @@
         "revision" : "1fe824b80d89201652e7eca7c9252269a1d85e25",
         "version" : "2.0.1"
       }
+    },
+    {
+      "identity" : "yams",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/Yams",
+      "state" : {
+        "revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d",
+        "version" : "5.1.3"
+      }
     }
   ],
   "version" : 2

diff --git a/Scripts/install.sh b/Scripts/install.sh
@@ -16,13 +16,13 @@ swift package clean
 if [[ "$OSTYPE" == "darwin"* ]]; then
     BUILD_FOLDER=".build/release"
     swift build --disable-sandbox -c release
+    MAJOR_VERSION=$(swift --version | awk '{print $4}' | cut -d '.' -f 1)
 else
     BUILD_FOLDER=".build/debug"
     swift build --disable-sandbox
+    MAJOR_VERSION=$(swift --version | awk '{for(i=1;i<=NF;i++){if($i ~ /^[0-9]+\.[0-9]+$/){print $i; break}}}' | cut -d '.' -f 1)
 fi
 
-MAJOR_VERSION=$(swift --version | awk '{print $4}' | cut -d '.' -f 1)
-
 mkdir -p "$PREFIX/bin"
 mkdir -p "$LIB_INSTALL_PATH"
 cp -f "$BUILD_FOLDER/$TOOL_NAME" "$INSTALL_PATH"