Merge pull request #74 from khipu/master

Merging to prod
khipu · Dec 27, 2024 · 46e6d82 · 46e6d82
2 parents c3cd885 + 6adea6c
commit 46e6d82
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,34 +2,36 @@ name: Deploy to Cocoapods
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - prod
+  workflow_dispatch:
 
 jobs:
-  build:
-    name: Deploy KhipuClientIOS to Cocoapods # https://cocoapods.org/pods/KhipuClientIOS
+  deploy:
+    name: Deploy to Cocoapods # https://cocoapods.org/pods/KhipuClientIOS
     runs-on: macos-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Install Cocoapods
-      run: pod install --project-directory=Example
+      - name: Install Cocoapods
+        run: pod install --project-directory=Example
 
-    - name: Create and Push Tag
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        set -eo pipefail
-        VERSION=$(grep -oE "s.version.*= *'[^']*'" KhipuClientIOS.podspec | grep -oE "'[^']*'" | tr -d "'")
-        echo "Detected version: $VERSION"
-        git tag $VERSION
-        git push origin $VERSION
+      - name: Create and Push Tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -eo pipefail
+          VERSION=$(grep -oE "s.version.*= *'[^']*'" KhipuClientIOS.podspec | grep -oE "'[^']*'" | tr -d "'")
+          echo "Detected version: $VERSION"
+          git tag $VERSION
+          git push origin $VERSION
 
-    - name: Deploy to Cocoapods
-      env:
-        COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-      run: |
-        set -eo pipefail
-        pod lib lint --allow-warnings
-        pod trunk push --allow-warnings
+      - name: Deploy to Cocoapods
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        run: |
+          set -eo pipefail
+          pod lib lint --allow-warnings
+          pod trunk push --allow-warnings
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,11 +2,16 @@ name: Run Tests
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
+  push:
+    branches:
+      - master
+      - prod
 
 jobs:
   build:
-    name: Build and Test KhipuClientIOS-Example scheme using any available iPhone simulator
+    name: Build and Test # Builds and tests KhipuClientIOS-Example scheme using any available iPhone simulator
     runs-on: macos-latest
 
     steps: