Merge branch 'trunk' into etoledom/split-gravatarurl

Automattic · Mar 26, 2024 · 2e96700 · 2e96700
2 parents 5ccbef8 + 4858685
commit 2e96700
Show file tree

Hide file tree

Showing 12 changed files with 325 additions and 25 deletions.
diff --git a/.buildkite/commands/build-demos.sh b/.buildkite/commands/build-demos.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- 🛠 Building Demo (Swift)"
+bundle exec fastlane build_demo scheme:Gravatar-Demo
+
+echo "--- 🛠 Building Demo (SwiftUI)"
+bundle exec fastlane build_demo scheme:Gravatar-SwiftUI-Demo
diff --git a/.buildkite/commands/publish-pod.sh b/.buildkite/commands/publish-pod.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -eu
+
+if [ $# -ne 1 ]; then
+    echo "Error: CocoaPods publishing failed. Specify a path to a podspec."
+    exit 1
+fi
+
+SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK
+PODSPEC_PATH="$1"
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
+publish_pod "$PODSPEC_PATH"
+
+echo "--- :slack: Notifying Slack"
+slack_notify_pod_published "$PODSPEC_PATH" "$SLACK_WEBHOOK"
+
diff --git a/.buildkite/commands/validate-pods.sh b/.buildkite/commands/validate-pods.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :microscope: Validate Podspec"
+# For some reason this fixes a failure in `lib lint`
+# https://github.com/Automattic/buildkite-ci/issues/7
+xcrun simctl list >> /dev/null
+bundle exec pod lib lint \
+    --include-podspecs="*.podspec" \
+    --verbose --fail-fast
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -13,6 +13,7 @@ steps:
   # Lint Source files
   #################
   - label: "🧪 Lint"
+    key: "lint"
     command: |
       echo "--- 🛠 Linting"
       make lint
@@ -21,14 +22,43 @@ steps:
   # Build and Test
   #################
   - label: "🧪 Build and Test"
+    key: "test"
     command: |
-      echo "--- 🛠 Building + Testing"
-      make test
+      validate_swift_package
+    plugins: [$CI_TOOLKIT]
+
+  #################
+  # Build Demo
+  #################
+  - label: "🧪 Build Demo Project"
+    key: "test_demo"
+    command: |
+      .buildkite/commands/build-demos.sh
+    plugins: [$CI_TOOLKIT]
 
   ###################
   # Validate Podspec
   ###################
   - label: "🧪 Validate Podspec"
+    key: "validate"
+    command: |
+      .buildkite/commands/validate-pods.sh
+    plugins: [$CI_TOOLKIT]
+
+  #######################
+  # Publish the Podspecs (if we're building a tag)
+  #######################
+  - label: "⬆️ Publish Podspecs"
+    key: "publish"
     command: |
-      echo "--- :microscope: Validate Podspec"
-      make validate-pod-ci
+      .buildkite/commands/publish-pod.sh "Gravatar.podspec"
+      .buildkite/commands/publish-pod.sh "GravatarUI.podspec"
+    plugins: [$CI_TOOLKIT]
+    depends_on:
+      - "test"
+      - "test_demo"
+      - "validate"
+      - "lint"
+    if: build.tag != null
+    agents:
+      queue: "mac"
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,8 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
+
+# Fastlane
+fastlane/README.md
+fastlane/report.xml
+fastlane/test_output
diff --git a/Gemfile b/Gemfile
@@ -3,3 +3,4 @@
 source 'https://rubygems.org'
 
 gem 'cocoapods', '~> 1.14.3'
+gem "fastlane", "~> 2.219"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,7 +18,25 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    artifactory (3.0.17)
     atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.899.0)
+    aws-sdk-core (3.191.4)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.146.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
     base64 (0.2.0)
     bigdecimal (3.1.5)
     claide (1.1.0)
@@ -59,50 +77,213 @@ GEM
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
+    colored (1.2)
     colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
     drb (2.2.0)
       ruby2_keywords
+    emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
+    excon (0.110.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
     ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
     json (2.7.1)
+    jwt (2.8.1)
+      base64
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
     minitest (5.21.1)
     molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
+    naturally (2.2.1)
     netrc (0.11.0)
+    optparse (0.4.0)
+    os (1.1.4)
+    plist (3.7.1)
     public_suffix (4.0.7)
+    rake (13.1.0)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
     rexml (3.2.6)
+    rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.3)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    word_wrap (1.0.0)
     xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   arm64-darwin-23
   ruby
 
 DEPENDENCIES
   cocoapods (~> 1.14.3)
+  fastlane (~> 2.219)
 
 BUNDLED WITH
    2.5.4
diff --git a/Gravatar.podspec b/Gravatar.podspec
@@ -1,6 +1,8 @@
+require_relative 'version'
+
 Pod::Spec.new do |s|
   s.name             = 'Gravatar'
-  s.version          = '0.1.1'
+  s.version          = Gravatar::VERSION
   s.summary          = 'A convient library for accessing the Gravatar API'
 
   s.homepage         = 'https://gravatar.com'
@@ -35,4 +37,3 @@ Pod::Spec.new do |s|
     swift_unit_tests.requires_app_host = false
   end
 end
-
diff --git a/GravatarUI.podspec b/GravatarUI.podspec
@@ -1,6 +1,8 @@
+require_relative 'version'
+
 Pod::Spec.new do |s|
     s.name             = 'GravatarUI'
-    s.version          = '0.1.1'
+    s.version          = Gravatar::VERSION
     s.summary          = 'A convient library of Gravatar UI components'
 
     s.homepage         = 'https://gravatar.com'
@@ -36,5 +38,3 @@ Pod::Spec.new do |s|
       swift_unit_tests.requires_app_host = false
     end
   end
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		source 'https://rubygems.org'

		gem 'cocoapods', '~> 1.14.3'
		gem "fastlane", "~> 2.219"