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/2.4.1 into master #363

Merged
merged 4 commits into from
Aug 21, 2023
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
9 changes: 5 additions & 4 deletions .github/workflows/draft-new-release-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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 @@ -35,7 +35,8 @@ jobs:
source_branch_name=${GITHUB_REF##*/}
release_type=release
grep -q "hotfix/" <<< "${GITHUB_REF}" && release_type=hotfix-release
git fetch origin master-v2 --depth=1
git fetch origin master-v2
git fetch --tags origin
git merge origin/master-v2
current_version=$(jq -r .version package.json)

Expand Down Expand Up @@ -73,11 +74,11 @@ jobs:
git add README.md Sources/Classes/Common/Constants/RSVersion.swift sonar-project.properties
echo ${{ steps.create-release.outputs.new_version }}
echo "commit_summary=$SUMMARY" >> $GITHUB_OUTPUT
npx standard-version -a
npx standard-version -a --skip.tag

- name: Push new version in release branch & tag
run: |
git push --follow-tags
git push

- name: Create pull request into master
uses: repo-sync/pull-request@v2
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/publish-new-release-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,26 @@ jobs:
with:
node-version: 16

- name: Create Github Release
# 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
run: |
git config user.name "GitHub actions"
git config user.email [email protected]

- name: Create Github Release & Tag
id: create_release
env:
HUSKY: 0
GITHUB_TOKEN: ${{ secrets.PAT }}
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.PAT }}
run: |
npx conventional-github-releaser -p angular
git for-each-ref refs/tags
./Scripts/find-tag.sh ${{ steps.extract-version.outputs.release_version }} && git tag --delete ${{ steps.extract-version.outputs.release_version }} && git push --delete origin ${{ steps.extract-version.outputs.release_version }}
git tag -a v${{ steps.extract-version.outputs.release_version }} -m "chore: release v${{ steps.extract-version.outputs.release_version }}"
git push origin refs/tags/v${{ steps.extract-version.outputs.release_version }}
git for-each-ref refs/tags
DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js

- name: Create pull request into develop
uses: repo-sync/pull-request@v2
Expand Down
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.

### [2.4.1](https://github.com/rudderlabs/rudder-sdk-ios/compare/v2.4.0...v2.4.1) (2023-08-21)


### Bug Fixes

* no events recorded for dm destinations on the first launch ([#360](https://github.com/rudderlabs/rudder-sdk-ios/issues/360)) ([f49398c](https://github.com/rudderlabs/rudder-sdk-ios/commit/f49398c58ad25d4a149928341afefe74a673201f))

## [2.4.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v2.3.1...v2.4.0) (2023-06-02)


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=v2.4.0&color=blue&style=flat">
<img src="https://img.shields.io/static/v1?label=pod&message=v2.4.1&color=blue&style=flat">
</a>
</p>

Expand Down Expand Up @@ -47,15 +47,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', '2.4.0'
pod 'Rudder', '2.4.1'
```

### Carthage

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

```xcode
github "rudderlabs/rudder-sdk-ios" "v2.4.0"
github "rudderlabs/rudder-sdk-ios" "v2.4.1"
```

> Remember to include the following code where you want to refer to or use the RudderStack SDK classes, as shown:
Expand Down Expand Up @@ -86,7 +86,7 @@ You can also add the RudderStack SDK using the Swift Package Mangaer in one of t
![Adding a package](https://user-images.githubusercontent.com/59817155/140903027-286a1d64-f5d5-4041-9827-47b6cef76a46.png)

2. Enter the package repository (`[email protected]:rudderlabs/rudder-sdk-ios.git`) in the search bar.
3. In **Dependency Rule**, select **Up to Next Major Version**, and enter `2.4.0` as the value, as shown:
3. In **Dependency Rule**, select **Up to Next Major Version**, and enter `2.4.1` as the value, as shown:

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

Expand All @@ -113,7 +113,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "2.4.0")
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "2.4.1")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
7 changes: 7 additions & 0 deletions Scripts/find-tag.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

if [ $(git tag -l "$1") ]; then
exit 0
else
exit 1
fi
2 changes: 1 addition & 1 deletion Sources/Classes/Client/RSClient+Plugins.swift
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ extension RSClient {

switch result {
case .success(let serverConfig):
self.update(serverConfig: serverConfig, type: .refresh)
self.serverConfig = serverConfig
self.update(serverConfig: serverConfig, type: .refresh)
RSUserDefaults.saveServerConfig(serverConfig)
RSUserDefaults.updateLastUpdatedTime(RSUtils.getTimeStamp())
self.log(message: "server config download successful", logLevel: .debug)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Classes/Common/Constants/RSVersion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
import Foundation

// don't edit this line
let RSVersion = "2.4.0"
let RSVersion = "2.4.1"
5 changes: 5 additions & 0 deletions github-release.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
gitRawCommitsOpts: {
merges: null
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "2.4.0",
"version": "2.4.1",
"description": "Rudder is a platform for collecting, storing and routing customer event data to dozens of tools"
}
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sonar.qualitygate.wait=false
sonar.projectKey=rudderlabs_rudder-sdk-ios-v2
sonar.organization=rudderlabs
sonar.projectName=RudderStack iOS SDK(v2)
sonar.projectVersion=2.4.0
sonar.projectVersion=2.4.1

# Meta-data for the project
sonar.links.scm=https://github.com/rudderlabs/rudder-sdk-ios
Expand Down
Loading