Merge pull request #54 from SwiftPackageIndex/renamed-dependency-check-2

CheckDependencies2 → CheckDependencies
SwiftPackageIndex · Jan 5, 2024 · bdc08ad · bdc08ad
2 parents 4cd97c1 + 4270595
commit bdc08ad
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,13 +17,11 @@ name: CI
 on:
     workflow_dispatch:
     push:
-      # branches: [ main ]
-    pull_request:
-      branches: [ main ]
 
 env:
   DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  SPI_API_TOKEN: ${{ secrets.SPI_API_TOKEN }}
 
 jobs:
   test-validator-Linux:
@@ -41,6 +39,9 @@ jobs:
         run: |
           swift build
 
+      - name: Install curl
+        run: apt-get update && apt-get install -y curl
+
       - name: Check redirects
         run: ./check-redirects.sh
 

diff --git a/...torCore/Commands/CheckDependencies2.swift → ...atorCore/Commands/CheckDependencies.swift b/...torCore/Commands/CheckDependencies2.swift → ...atorCore/Commands/CheckDependencies.swift
@@ -19,7 +19,7 @@ import AsyncHTTPClient
 import CanonicalPackageURL
 
 
-public struct CheckDependencies2: AsyncParsableCommand {
+public struct CheckDependencies: AsyncParsableCommand {
     @Option(name: .long)
     var apiBaseURL: String = "https://swiftpackageindex.com"
 
@@ -29,6 +29,9 @@ public struct CheckDependencies2: AsyncParsableCommand {
     @Option(name: .shortAndLong)
     var limit: Int = .max
 
+    @Option(name: .shortAndLong)
+    var maxCheck: Int = .max
+
     @Option(name: .shortAndLong, help: "save changes to output file")
     var output: String?
 
@@ -58,6 +61,7 @@ public struct CheckDependencies2: AsyncParsableCommand {
         var newPackages = UniqueCanonicalPackageURLs()
         for (idx, dep) in missing
             .sorted(by: { $0.packageURL.absoluteString < $1.packageURL.absoluteString })
+            .prefix(maxCheck)
             .enumerated() {
             if idx % 10 == 0 {
                 print("Progress:", idx, "/", missing.count)
@@ -124,7 +128,7 @@ public struct CheckDependencies2: AsyncParsableCommand {
 }
 
 
-extension CheckDependencies2 {
+extension CheckDependencies {
     var inputSource: InputSource {
         switch (input, packageUrls.count) {
             case (.some(let fname), 0):

diff --git a/Sources/ValidatorCore/Commands/Validator.swift b/Sources/ValidatorCore/Commands/Validator.swift
@@ -18,7 +18,7 @@ import ArgumentParser
 public struct Validator: AsyncParsableCommand {
     public static var configuration = CommandConfiguration(
         abstract: "SPI Validator",
-        subcommands: [CheckDependencies2.self,
+        subcommands: [CheckDependencies.self,
                       CheckRedirects.self,
                       MergeLists.self,
                       ApplyDenyList.self,

diff --git a/Tests/ValidatorTests/CheckDependencies2Tests.swift b/Tests/ValidatorTests/CheckDependencies2Tests.swift
@@ -21,7 +21,7 @@ import NIO
 
 
 final class CheckDependencies2Tests: XCTestCase {
-    var check = CheckDependencies2()
+    var check = CheckDependencies()
 
     override func setUp() {
         super.setUp()

diff --git a/check-dependencies.sh b/check-dependencies.sh
@@ -22,4 +22,7 @@ curl -s https://raw.githubusercontent.com/SwiftPackageIndex/PackageList/main/pac
 echo "..."
 echo
 
-$validator check-dependencies --use-package-list -o packages.json -l 10 --chunk 1 --number-of-chunks 3
+$validator check-dependencies \
+    --spi-api-token "$SPI_API_TOKEN" \
+    -i packages.json -o packages.json \
+    --max-check 1