From d5410d9ac6d13e7c68d6b37aa50a930692f4aaa7 Mon Sep 17 00:00:00 2001 From: Pallab Maiti Date: Fri, 29 Sep 2023 12:57:57 +0530 Subject: [PATCH 1/4] fix workflows --- .github/workflows/deploy-cocoapods.yml | 1 - .github/workflows/deploy-private-pod.yml | 16 ++++++++++------ .github/workflows/draft-new-beta-release.yml | 16 ++++++++++------ .github/workflows/slack-notify.yml | 1 - 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-cocoapods.yml b/.github/workflows/deploy-cocoapods.yml index 4e5f327b..f3fbfd5a 100644 --- a/.github/workflows/deploy-cocoapods.yml +++ b/.github/workflows/deploy-cocoapods.yml @@ -8,7 +8,6 @@ jobs: build: name: Deploy to Cocoapods runs-on: macOS-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout source branch uses: actions/checkout@v4 diff --git a/.github/workflows/deploy-private-pod.yml b/.github/workflows/deploy-private-pod.yml index 05fee893..f78e23f5 100644 --- a/.github/workflows/deploy-private-pod.yml +++ b/.github/workflows/deploy-private-pod.yml @@ -13,18 +13,22 @@ jobs: runs-on: macOS-latest if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) steps: - - name: Checkout + - name: 'Checkout' uses: actions/checkout@v4 with: ref: '${{ github.event.pull_request.head.ref }}' - - name: Install Cocoapods + - name: 'Install Cocoapods' run: gem install cocoapods + + - name: 'Convert podspec to podspec.json' + run: | + pod ipc spec Rudder.podspec > Rudder.podspec.json - - name: Add Private Spec Repo to CocoaPods installation + - name: 'Add Private Spec Repo to CocoaPods installation' run: | - pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git + pod repo add rudderlabs https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git - - name: Add Podspec to repo + - name: 'Add Podspec to repo' run: | - pod repo push Rudder Rudder.podspec + pod repo push rudderlabs Rudder.podspec.json diff --git a/.github/workflows/draft-new-beta-release.yml b/.github/workflows/draft-new-beta-release.yml index f58115a9..bbe91b24 100644 --- a/.github/workflows/draft-new-beta-release.yml +++ b/.github/workflows/draft-new-beta-release.yml @@ -82,18 +82,22 @@ jobs: run: | git push - - name: Checkout + - name: 'Checkout' uses: actions/checkout@v4 with: ref: '${{ steps.create-release.outputs.branch_name }}' - - name: Install Cocoapods + - name: 'Install Cocoapods' run: gem install cocoapods - - name: Add Private Spec Repo to CocoaPods installation + - name: 'Convert podspec to podspec.json' run: | - pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git + pod ipc spec Rudder.podspec > Rudder.podspec.json - - name: Add Podspec to repo + - name: 'Add Private Spec Repo to CocoaPods installation' run: | - pod repo push Rudder Rudder.podspec + pod repo add rudderlabs https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git + + - name: 'Add Podspec to repo' + run: | + pod repo push rudderlabs Rudder.podspec.json diff --git a/.github/workflows/slack-notify.yml b/.github/workflows/slack-notify.yml index 3049addb..40d90e8e 100644 --- a/.github/workflows/slack-notify.yml +++ b/.github/workflows/slack-notify.yml @@ -8,7 +8,6 @@ jobs: deploy-tag: name: Notify Slack runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Send message to Slack channel id: slack From 1ccf2a61ea44e39d3351490510986ad3079cd114 Mon Sep 17 00:00:00 2001 From: Pallab Maiti Date: Fri, 29 Sep 2023 13:01:56 +0530 Subject: [PATCH 2/4] updated email in podspec --- Rudder.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rudder.podspec b/Rudder.podspec index 68fac6b0..988e6a4d 100644 --- a/Rudder.podspec +++ b/Rudder.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/rudderlabs/rudder-sdk-ios" s.license = { :type => "Apache", :file => "LICENSE" } - s.author = { "RudderStack" => "arnab@rudderlabs.com" } + s.author = { "RudderStack" => "sdk-accounts@rudderlabs.com" } s.source = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" } s.ios.deployment_target = '12.0' From 6cc2b434eebb104e661e55cdd63824835df2703f Mon Sep 17 00:00:00 2001 From: Pallab Maiti Date: Fri, 29 Sep 2023 14:43:07 +0530 Subject: [PATCH 3/4] Update Rudder.podspec --- Rudder.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rudder.podspec b/Rudder.podspec index 988e6a4d..c5aeea75 100644 --- a/Rudder.podspec +++ b/Rudder.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/rudderlabs/rudder-sdk-ios" s.license = { :type => "Apache", :file => "LICENSE" } - s.author = { "RudderStack" => "sdk-accounts@rudderlabs.com" } + s.author = { "RudderStack" => "sdk-accounts@rudderstack.com" } s.source = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" } s.ios.deployment_target = '12.0' From 53906e6016d53150a59736affa29bc7c5a74537d Mon Sep 17 00:00:00 2001 From: Pallab Maiti Date: Fri, 29 Sep 2023 18:59:24 +0530 Subject: [PATCH 4/4] Update Rudder.podspec --- Rudder.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rudder.podspec b/Rudder.podspec index c5aeea75..a0c44e6c 100644 --- a/Rudder.podspec +++ b/Rudder.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/rudderlabs/rudder-sdk-ios" s.license = { :type => "Apache", :file => "LICENSE" } - s.author = { "RudderStack" => "sdk-accounts@rudderstack.com" } + s.author = { "RudderStack" => "sdk@rudderstack.com" } s.source = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" } s.ios.deployment_target = '12.0'