From e8c34189daebb28d26f891c3117a6dc6502e79e8 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:09:01 +0530 Subject: [PATCH 1/5] SDK-2574 Release a version using Xcode 16 --- CHANGELOG.md | 5 +++++ RiskManager.podspec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e99aab3..13ac5d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # CHANGELOG +## 0.2.9 + +Release a version with Xcode 16 + + ## 0.2.8 Fix Location Sync issue diff --git a/RiskManager.podspec b/RiskManager.podspec index 8d5b5a3..05c3ecb 100644 --- a/RiskManager.podspec +++ b/RiskManager.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |spec| # spec.name = "RiskManager" - spec.version = "0.2.8" + spec.version = "0.2.9" spec.summary = "DeviceConnect IOS SDK to enable data collection from IOS devices" # This description is used to generate tags and improve search results. From 6f359967e154bc03e3d551ac12233dc5c978c4b0 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:19:30 +0530 Subject: [PATCH 2/5] Create restrict-branch-merge.yml --- .github/workflows/restrict-branch-merge.yml | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/restrict-branch-merge.yml diff --git a/.github/workflows/restrict-branch-merge.yml b/.github/workflows/restrict-branch-merge.yml new file mode 100644 index 0000000..83713ad --- /dev/null +++ b/.github/workflows/restrict-branch-merge.yml @@ -0,0 +1,24 @@ +name: "Enforce Branch Merge Rules" + +on: + pull_request: + branches: + - master + - release + +jobs: + check-branch: + runs-on: ubuntu-latest + + steps: + - name: Enforce develop -> release + if: github.ref == 'refs/heads/release' && github.head_ref != 'develop' + run: | + echo "Only the develop branch can be merged into the release branch." + exit 1 + + - name: Enforce release/hotfix -> master + if: github.ref == 'refs/heads/master' && github.head_ref != 'release' && github.head_ref != 'hotfix' + run: | + echo "Only the release or hotfix branch can be merged into the master branch." + exit 1 From 540b5618d29664a44bbb83576ee2ebc5ca409440 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:22:10 +0530 Subject: [PATCH 3/5] Delete restrict-master workflow --- .github/workflows/restrict-main.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/restrict-main.yml diff --git a/.github/workflows/restrict-main.yml b/.github/workflows/restrict-main.yml deleted file mode 100644 index 5dd8e6b..0000000 --- a/.github/workflows/restrict-main.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Enforce Release or Hotfix Branch Merge" - -on: - pull_request: - branches: - - main - -jobs: - check-branch: - runs-on: ubuntu-latest - steps: - - name: Check if PR is from the release or hotfix branch - if: github.head_ref != 'release' && github.head_ref != 'hotfix' - run: | - echo "Only the release or hotfix branch can be merged into main." - exit 1 From 287a276a92381367e6abbc463a6e5593dcc60706 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:22:22 +0530 Subject: [PATCH 4/5] Delete restrict-release workflow --- .github/workflows/restrict-release.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/restrict-release.yml diff --git a/.github/workflows/restrict-release.yml b/.github/workflows/restrict-release.yml deleted file mode 100644 index 2791089..0000000 --- a/.github/workflows/restrict-release.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Enforce Release Branch Merge" - -on: - pull_request: - branches: - - release - -jobs: - check-branch: - runs-on: ubuntu-latest - steps: - - name: Check if PR is from the develop branch - if: github.head_ref != 'develop' - run: | - echo "Only the develop branch can be merged into release." - exit 1 From ce5675069646f76477fd068682b214bd837b5a12 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:35:03 +0530 Subject: [PATCH 5/5] Fix the branch names in restrict-branch-merge.yml --- .github/workflows/restrict-branch-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/restrict-branch-merge.yml b/.github/workflows/restrict-branch-merge.yml index 83713ad..be96c73 100644 --- a/.github/workflows/restrict-branch-merge.yml +++ b/.github/workflows/restrict-branch-merge.yml @@ -3,7 +3,7 @@ name: "Enforce Branch Merge Rules" on: pull_request: branches: - - master + - main - release jobs: @@ -17,8 +17,8 @@ jobs: echo "Only the develop branch can be merged into the release branch." exit 1 - - name: Enforce release/hotfix -> master - if: github.ref == 'refs/heads/master' && github.head_ref != 'release' && github.head_ref != 'hotfix' + - name: Enforce release/hotfix -> main + if: github.ref == 'refs/heads/main' && github.head_ref != 'release' && github.head_ref != 'hotfix' run: | - echo "Only the release or hotfix branch can be merged into the master branch." + echo "Only the release or hotfix branch can be merged into the main branch." exit 1