Skip to content

Commit

Permalink
Merge branch 'develop' into feat.customerIo-in-app-message
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsSudip authored Nov 9, 2023
2 parents a133fce + 0874512 commit e8d310a
Show file tree
Hide file tree
Showing 15 changed files with 871 additions and 498 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-hotfix-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

# Only allow release stakeholders to initiate releases
if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'lvrach' || github.actor == 'cisse21' || github.actor == 'nidhilashkari17' || github.actor == 'debanjan97' || github.actor == 'AchuthaSourabhC' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'mihir-4116' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'lvrach' || github.triggering_actor == 'cisse21' || github.triggering_actor == 'nidhilashkari17' || github.triggering_actor == 'debanjan97' || github.triggering_actor == 'AchuthaSourabhC' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507'|| github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'ujjwal-ab')
if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'lvrach' || github.actor == 'cisse21' || github.actor == 'nidhilashkari17' || github.actor == 'debanjan97' || github.actor == 'AchuthaSourabhC' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'mihir-4116' || github.actor == 'ujjwal-ab' || github.actor == 'aashishmalik') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'lvrach' || github.triggering_actor == 'cisse21' || github.triggering_actor == 'nidhilashkari17' || github.triggering_actor == 'debanjan97' || github.triggering_actor == 'AchuthaSourabhC' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507'|| github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'ujjwal-ab' || github.triggering_actor == 'aashishmalik')
steps:
- name: Create Branch
uses: peterjgrainger/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

# Only allow release stakeholders to initiate releases
if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'lvrach' || github.actor == 'cisse21' || github.actor == 'nidhilashkari17' || github.actor == 'debanjan97' || github.actor == 'AchuthaSourabhC' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'lvrach' || github.triggering_actor == 'cisse21' || github.triggering_actor == 'nidhilashkari17' || github.triggering_actor == 'debanjan97' || github.triggering_actor == 'AchuthaSourabhC' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'ujjwal-ab')
if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'lvrach' || github.actor == 'cisse21' || github.actor == 'nidhilashkari17' || github.actor == 'debanjan97' || github.actor == 'AchuthaSourabhC' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'ujjwal-ab' || github.actor == 'aashishmalik') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'lvrach' || github.triggering_actor == 'cisse21' || github.triggering_actor == 'nidhilashkari17' || github.triggering_actor == 'debanjan97' || github.triggering_actor == 'AchuthaSourabhC' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'ujjwal-ab' || github.triggering_actor == 'aashishmalik')
steps:
- name: Checkout
uses: actions/[email protected]
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.

### [1.58.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.58.0...v1.58.1) (2023-11-09)


### Bug Fixes

* removed mobile from supportedSourceTypes ([81110d4](https://github.com/rudderlabs/rudder-config-schema/commit/81110d4174dc18f0b99f93e988b696627715c587))

## [1.58.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.57.2...v1.58.0) (2023-11-06)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.58.0",
"version": "1.58.1",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
51 changes: 33 additions & 18 deletions src/configurations/destinations/mp/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"oneTrustCookieCategories",
"ketchConsentPurposes",
"eventFilteringOption",
"identityMergeApi"
"identityMergeApi",
"ignoreDnt"
],
"excludeKeys": [],
"supportedSourceTypes": [
Expand All @@ -46,28 +47,25 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {
"web": ["cloud", "device"],
"android": ["cloud"],
"ios": ["cloud"],
"unity": ["cloud"],
"amp": ["cloud"],
"reactnative": ["cloud"],
"flutter": ["cloud"],
"cordova": ["cloud"],
"shopify": ["cloud"]
},
"supportedMessageTypes": ["alias", "group", "identify", "page", "screen", "track"],
"destConfig": {
"defaultConfig": [
"token",
"groupKeySettings",
"apiSecret",
"dataResidency",
"people",
"setAllTraitsByDefault",
"superProperties",
"peopleProperties",
"eventIncrements",
"propIncrements",
"consolidatedPageCalls",
"trackCategorizedPages",
"trackNamedPages",
"sourceName",
"crossSubdomainCookie",
"persistence",
"persistenceType",
"persistenceName",
"secureCookie",
"blacklistedEvents",
"whitelistedEvents",
"eventFilteringOption",
Expand All @@ -80,10 +78,27 @@
"identityMergeApi",
"userDeletionApi",
"gdprApiToken",
"strictMode",
"ignoreDnt"
"strictMode"
],
"web": ["useNativeSDK"]
"web": [
"useNativeSDK",
"connectionMode",
"people",
"setAllTraitsByDefault",
"ignoreDnt",
"consolidatedPageCalls",
"trackCategorizedPages",
"trackNamedPages",
"sourceName",
"crossSubdomainCookie",
"persistence",
"persistenceType",
"persistenceName",
"secureCookie",
"superProperties",
"peopleProperties",
"eventIncrements"
]
},
"secretKeys": ["token", "gdprApiToken"]
}
Expand Down
Loading

0 comments on commit e8d310a

Please sign in to comment.