Merge pull request #20 from gumob:release/v3.0.0

ci: Update workflow to trigger on 'main' and 'develop' branches
gumob · Aug 25, 2024 · f00c58d · f00c58d
2 parents 413879f + 552884b
commit f00c58d
Show file tree

Hide file tree

Showing 12 changed files with 2,572 additions and 1,551 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,6 +6,7 @@ name: main
 on:
   push:
     branches:
+      - main
       - develop
     paths:
       - .github/workflows/**
@@ -315,86 +316,86 @@ jobs:
             --cache-builds
     needs: SPM
 
-  # cocoapods:
-  #   name: "Pods: ${{ matrix.platform }}, ${{ matrix.configuration }}"
-  #   runs-on: ${{ matrix.runsOn }}
-  #   env:
-  #     DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-  #   strategy:
-  #     fail-fast: true
-  #     matrix:
-  #       include:
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "macos"
-  #           configuration: "Release"
-  #           name: "Pods: macOS, Release"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "macos"
-  #           configuration: "Debug"
-  #           name: "Pods: macOS, Debug"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "ios"
-  #           configuration: "Release"
-  #           name: "Pods: iOS, Release"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "ios"
-  #           configuration: "Debug"
-  #           name: "Pods: iOS, Debug"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "tvos"
-  #           configuration: "Release"
-  #           name: "Pods: tvOS, Release"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "tvos"
-  #           configuration: "Debug"
-  #           name: "Pods: tvOS, Debug"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "watchos"
-  #           configuration: "Release"
-  #           name: "Pods: watchOS, Release"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "watchos"
-  #           configuration: "Debug"
-  #           name: "Pods: watchOS, Debug"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "visionos"
-  #           configuration: "Release"
-  #           name: "Pods: visionOS, Release"
-  #         - xcode: "Xcode_15.4"
-  #           runsOn: macOS-14
-  #           platform: "visionos"
-  #           configuration: "Debug"
-  #           name: "Pods: visionOS, Debug"
-  #   steps:
-  #     - name: Update CocoaPods
-  #       if: ${{ matrix.platform == 'visionos' }}
-  #       run: gem install cocoapods
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #     - name: Pod lib lint
-  #       run: |
-  #         pod lib lint --verbose \
-  #           --configuration=${{ matrix.configuration }} \
-  #           --platforms=${{ matrix.platform }} \
-  #           TLDExtractSwift.podspec
-  #     - name: Pod lib lint - Use Static Frameworks
-  #       run: |
-  #         pod lib lint --verbose --use-static-frameworks \
-  #           --configuration=${{ matrix.configuration }} \
-  #           --platforms=${{ matrix.platform }} \
-  #           TLDExtractSwift.podspec
-  #     # - name: Pod Push
-  #     #   if: github.ref == 'refs/heads/main'
-  #     #   run: |
-  #     #     pod repo update
-  #     #     pod trunk push TLDExtractSwift.podspec --allow-warnings
-  #   needs: carthage
+  cocoapods:
+    name: "Pods: ${{ matrix.platform }}, ${{ matrix.configuration }}"
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "macos"
+            configuration: "Release"
+            name: "Pods: macOS, Release"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "macos"
+            configuration: "Debug"
+            name: "Pods: macOS, Debug"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "ios"
+            configuration: "Release"
+            name: "Pods: iOS, Release"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "ios"
+            configuration: "Debug"
+            name: "Pods: iOS, Debug"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "tvos"
+            configuration: "Release"
+            name: "Pods: tvOS, Release"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "tvos"
+            configuration: "Debug"
+            name: "Pods: tvOS, Debug"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "watchos"
+            configuration: "Release"
+            name: "Pods: watchOS, Release"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "watchos"
+            configuration: "Debug"
+            name: "Pods: watchOS, Debug"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "visionos"
+            configuration: "Release"
+            name: "Pods: visionOS, Release"
+          - xcode: "Xcode_15.4"
+            runsOn: macOS-14
+            platform: "visionos"
+            configuration: "Debug"
+            name: "Pods: visionOS, Debug"
+    steps:
+      - name: Update CocoaPods
+        if: ${{ matrix.platform == 'visionos' }}
+        run: gem install cocoapods
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Pod lib lint
+        run: |
+          pod lib lint --verbose \
+            --configuration=${{ matrix.configuration }} \
+            --platforms=${{ matrix.platform }} \
+            TLDExtractSwift.podspec
+      - name: Pod lib lint - Use Static Frameworks
+        run: |
+          pod lib lint --verbose --use-static-frameworks \
+            --configuration=${{ matrix.configuration }} \
+            --platforms=${{ matrix.platform }} \
+            TLDExtractSwift.podspec
+      # - name: Pod Push
+      #   if: github.ref == 'refs/heads/main'
+      #   run: |
+      #     pod repo update
+      #     pod trunk push TLDExtractSwift.podspec --allow-warnings
+    needs: carthage
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1 @@
-# github "gumob/PunycodeSwift" ~> 3.0
-github "gumob/PunycodeSwift" "release/v3.0.0"
+github "gumob/PunycodeSwift" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "gumob/PunycodeSwift" "8e7de65d79e7a4bb74a474422bf07f6de57c8fec"
+github "gumob/PunycodeSwift" "2a15d8db8d34bfdd81f96b62acb4ac34157f9089"
diff --git a/Gemfile b/Gemfile
@@ -11,3 +11,6 @@ gem "travis"
 gem "fastlane"
 gem "slather"
 gem "xcpretty"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -160,6 +160,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-versioning (0.6.0)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-aarch64-linux-musl)
     ffi (1.17.0-arm-linux-gnu)
@@ -349,6 +350,7 @@ DEPENDENCIES
   cocoapods-clean
   cocoapods-deintegrate
   fastlane
+  fastlane-plugin-versioning
   slather
   travis
   xcpretty

diff --git a/Package.swift b/Package.swift
@@ -11,8 +11,7 @@ let package = Package(
             targets: ["TLDExtractSwift"])
     ],
     dependencies: [
-        // .package(url: "https://github.com/gumob/PunycodeSwift.git", .from: "3.0.0"),
-        .package(url: "https://github.com/gumob/PunycodeSwift.git", .branch("release/v3.0.0"))
+        .package(url: "https://github.com/gumob/PunycodeSwift.git", .upToNextMajor(from: "3.0.0")),
     ],
     targets: [
         .target(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "gumob/PunycodeSwift" "8e7de65d79e7a4bb74a474422bf07f6de57c8fec"
		github "gumob/PunycodeSwift" "2a15d8db8d34bfdd81f96b62acb4ac34157f9089"