Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pulling release/1.24.2 into master #434

Merged
merged 4 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16

# In order to make a commit, we need to initialize a user.
# You may choose to write something less generic here if you want, it doesn't matter functionality wise.
- name: Initialize mandatory git config
Expand All @@ -47,28 +47,50 @@ jobs:
run: |
DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js

- name: Install xcpretty
run: gem install xcpretty

- name: Install Cocoapods
run: gem install cocoapods

- name: Pod install
run: pod install --repo-update

- name: Generate XCFramework
run: |
sh ./scripts/generate-xcframework.sh

- name: Upload Release Artifact
run: |
zip -r Rudder-xcframeworks.zip xcframeworks
shasum -a 256 Rudder-xcframeworks.zip >Rudder-xcframeworks.sha256
gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.zip
gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.sha256
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create pull request into develop
uses: repo-sync/pull-request@v2
with:
source_branch: 'master'
destination_branch: 'develop'
source_branch: "master"
destination_branch: "develop"
github_token: ${{ secrets.PAT }}
pr_title: "chore(release): pulling master into develop post release v${{ steps.extract-version.outputs.release_version }}"
pr_body: ':crown: *An automated PR*'
pr_reviewer: 'pallabmaiti'
pr_body: ":crown: *An automated PR*"
pr_reviewer: "pallabmaiti"

- name: Delete hotfix release branch
uses: koj-co/delete-merged-action@master
if: startsWith(github.event.pull_request.head.ref, 'hotfix-release/')
with:
branches: 'hotfix-release/*'
branches: "hotfix-release/*"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Delete release branch
uses: koj-co/delete-merged-action@master
if: startsWith(github.event.pull_request.head.ref, 'release/')
with:
branches: 'release/*'
branches: "release/*"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [1.24.2](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.24.1...v1.24.2) (2024-01-03)


### Bug Fixes

* updated version of MetricsReporter in package.swift ([#433](https://github.com/rudderlabs/rudder-sdk-ios/issues/433)) ([8870ccd](https://github.com/rudderlabs/rudder-sdk-ios/commit/8870ccd41e3341e75edd8882fa2c12b33283ba9f))

### [1.24.1](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.24.0...v1.24.1) (2023-12-20)

## [1.24.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.23.1...v1.24.0) (2023-12-18)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
)
],
dependencies: [
.package(name: "MetricsReporter", url: "https://github.com/rudderlabs/metrics-reporter-ios", from: "1.1.0"),
.package(name: "MetricsReporter", url: "https://github.com/rudderlabs/metrics-reporter-ios", from: "1.2.1"),
],
targets: [
.target(
Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- MetricsReporter (1.2.0):
- MetricsReporter (1.2.1):
- RSCrashReporter (= 1.0.1)
- RudderKit (= 1.4.0)
- RSCrashReporter (1.0.1)
- Rudder (1.24.0):
- MetricsReporter (= 1.2.0)
- Rudder (1.24.1):
- MetricsReporter (= 1.2.1)
- RudderKit (1.4.0)
- SQLCipher (4.5.4):
- SQLCipher/standard (= 4.5.4)
Expand All @@ -31,9 +31,9 @@ EXTERNAL SOURCES:
:path: "."

SPEC CHECKSUMS:
MetricsReporter: 1b381205a8bcc7ea5413c663cbb438e62078ee11
MetricsReporter: 99596ee5003c69949ed2f50acc34aee83c42f843
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
Rudder: 3e97f9c924c938dd36587a4496a56c3beec286bc
Rudder: 8091e861028a12add1107b03d224d4abf08c597f
RudderKit: d9d6997696e1642b753d8bdf94e57af643a68f03
SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<p align="center">
<a href="https://cocoapods.org/pods/Rudder">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.24.1&color=blue&style=flat">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.24.2&color=blue&style=flat">
</a>
</p>

Expand Down Expand Up @@ -39,15 +39,15 @@ The iOS SDK is available through [**CocoaPods**](https://cocoapods.org), [**Cart
To install the SDK, simply add the following line to your Podfile:

```xcode
pod 'Rudder', '1.24.1'
pod 'Rudder', '1.24.2'
```

### Carthage

For Carthage support, add the following line to your `Cartfile`:

```xcode
github "rudderlabs/rudder-sdk-ios" "v1.24.1"
github "rudderlabs/rudder-sdk-ios" "v1.24.2"
```

> Remember to include the following code in all `.m` and `.h` files where you want to refer to or use the RudderStack SDK classes, as shown:
Expand All @@ -71,7 +71,7 @@ You can also add the RudderStack iOS SDK via Swift Package Mangaer, via one of t

* Enter the package repository (`[email protected]:rudderlabs/rudder-sdk-ios.git`) in the search bar.

* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.24.1` as the value, as shown:
* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.24.2` as the value, as shown:

![Setting dependency](https://user-images.githubusercontent.com/59817155/145574696-8c849749-13e0-40d5-aacb-3fccb5c8e67d.png)

Expand Down Expand Up @@ -99,7 +99,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.24.1")
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.24.2")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion Rudder.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ Pod::Spec.new do |s|

s.source_files = 'Sources/**/*.{h,m}'

s.dependency 'MetricsReporter', '1.2.0'
s.dependency 'MetricsReporter', '1.2.1'
end
Loading
Loading