revert to macos-12 for release so to skip pod lint

grpc · Apr 27, 2024 · 1250d2c · 1250d2c
1 parent 8c91ccc
commit 1250d2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/prod_release_cocoapod.yml b/.github/workflows/prod_release_cocoapod.yml
@@ -10,7 +10,7 @@ env:
   TAG: ${{ github.event.release.tag_name }}
 jobs:
   release-cocoapod-gRPC-Core:
-    runs-on: macos-14
+    runs-on: macos-12
     steps:
       - name: Repo checkout
         uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
           version=${TAG#v}
           timeout 1h scripts/wait_for_pod_release.sh gRPC-Core $version
   release-cocoapod-gRPC-Cpp:
-    runs-on: macos-14
+    runs-on: macos-12
     needs: [release-cocoapod-gRPC-Core]
     steps:
       - name: Repo checkout
@@ -47,7 +47,7 @@ jobs:
           version=${TAG#v}
           timeout 1h scripts/wait_for_pod_release.sh gRPC-C++ $version
   release-cocoapod-gRPC-RxLibrary:
-    runs-on: macos-14
+    runs-on: macos-12
     steps:
       - name: Repo checkout
         uses: actions/checkout@v3
@@ -66,7 +66,7 @@ jobs:
           timeout 1h scripts/wait_for_pod_release.sh gRPC-RxLibrary $version
 
   release-cocoapod-gRPC:
-    runs-on: macos-14
+    runs-on: macos-12
     needs: [release-cocoapod-gRPC-RxLibrary, release-cocoapod-gRPC-Core]
     steps:
       - name: Repo checkout
@@ -86,7 +86,7 @@ jobs:
           timeout 1h scripts/wait_for_pod_release.sh gRPC $version
 
   release-cocoapod-gRPC-ProtoRPC:
-    runs-on: macos-14
+    runs-on: macos-12
     needs: [release-cocoapod-gRPC-RxLibrary, release-cocoapod-gRPC]
     steps:
       - name: Repo checkout

diff --git a/scripts/prepare_env.sh b/scripts/prepare_env.sh
@@ -10,3 +10,4 @@ set -ex
 brew install coreutils
 
 brew install pyyaml
+pip3 install pyyaml || true
diff --git a/scripts/release_cocoapod.sh b/scripts/release_cocoapod.sh
@@ -14,7 +14,7 @@ if [ -z "$TARGET_PODSPEC" ]; then
 fi
 
 # Skip lint during pod trunk push
-# ./scripts/skip_pod_push_lint.sh
+./scripts/skip_pod_push_lint.sh
 
 echo "Publishing podspec $TARGET_PODSPEC"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ set -ex
		brew install coreutils

		brew install pyyaml
		pip3 install pyyaml \|\| true