SDKCI-170 Align release branch naming for iOS publishing

mapbox · Nov 2, 2023 · 24b7bb9 · 24b7bb9
1 parent b70708c
commit 24b7bb9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/create_new_release.yml b/.github/workflows/create_new_release.yml
@@ -6,17 +6,18 @@ on:
 jobs:
   create-new-release:
     if: |
-      startsWith(github.head_ref, 'release-v') &&
-      startsWith(github.base_ref, 'main') &&
-      github.event.pull_request.merged
+      github.event.pull_request.merged &&
+      (startsWith(github.head_ref, 'release-v') ||
+      startsWith(github.head_ref, 'release/v')) &&
+      startsWith(github.base_ref, 'main')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Create release
         run: |
-          VERSION=$(echo "${{github.head_ref}}" | sed "s/^release-//")
+          VERSION=$(echo "${{github.head_ref}}" | sed -E "s/^release[\/-]//")
           gh release create $VERSION --notes "Bump to $VERSION" --title "Release-$VERSION" --target "${{github.head_ref}}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/merge_release_pr.yml b/.github/workflows/merge_release_pr.yml
@@ -6,8 +6,9 @@ on:
 jobs:
   approve-release-pull-request:
     if: |
-      startsWith(github.head_ref, 'release-v') &&
-      startsWith(github.base_ref, 'main') &&
+      (startsWith(github.head_ref, 'release-v') ||
+      startsWith(github.head_ref, 'release/v')) &&
+      startsWith(github.base_ref, 'main')
       startsWith(github.event.pull_request.user.login, 'mapbox-github-ci-writer-public-') &&
       github.event.pull_request.user.id == '93400552'
     runs-on: ubuntu-latest
@@ -19,8 +20,9 @@ jobs:
           PR: ${{ github.event.pull_request.html_url }}
   re-trigger-circleci-for-cocoapods:
     if: |
-      startsWith(github.head_ref, 'release-v') &&
-      startsWith(github.base_ref, 'main') &&
+      (startsWith(github.head_ref, 'release-v') ||
+      startsWith(github.head_ref, 'release/v')) &&
+      startsWith(github.base_ref, 'main')
       startsWith(github.event.pull_request.user.login, 'mapbox-github-ci-writer-public-') &&
       github.event.pull_request.user.id == '93400552'
     runs-on: ubuntu-latest

diff --git a/scripts/release/Sources/set-marketing-version/main.swift b/scripts/release/Sources/set-marketing-version/main.swift
@@ -61,8 +61,8 @@ struct MarketingVersion: ParsableCommand {
 
     func runSPMVersionUpdate() throws {
         let spmManifestURL = projectPathURL.appendingPathComponent("Tests/Integration/SPM/project.yml")
-        try replaceLineContaining("branch: release-v",
-                                  with: "    branch: release-v\(marketingVersion)",
+        try replaceLineContaining("branch: release/v",
+                                  with: "    branch: release/v\(marketingVersion)",
                                   in: spmManifestURL)
         let spmPackageURL = projectPathURL.appendingPathComponent("Package.swift")
         try replaceLineContaining("let version =",