Skip to content

Commit

Permalink
Merge branch 'development' into feat/seq_id_changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Netraj Patel committed Sep 24, 2024
2 parents e1066dc + e9ca094 commit 1ebf6e4
Show file tree
Hide file tree
Showing 40 changed files with 1,045 additions and 342 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/jira.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Create JIRA ISSUE
on:
pull_request:
types: [opened]
jobs:
security-jira:
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-') || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Login into JIRA
uses: atlassian/gajira-login@master
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
- name: Create a JIRA Issue
id: create
uses: atlassian/gajira-create@master
with:
project: ${{ secrets.JIRA_PROJECT }}
issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
summary: |
${{ github.event.pull_request.title }}
description: |
PR: ${{ github.event.pull_request.html_url }}
fields: "${{ secrets.JIRA_FIELDS }}"
- name: Transition issue
uses: atlassian/gajira-transition@v3
with:
issue: ${{ steps.create.outputs.issue }}
transition: ${{ secrets.JIRA_TRANSITION }}
24 changes: 6 additions & 18 deletions .github/workflows/release-package.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Contentstack iOS Delivery SDK Release

on:
push:
branches:
- main
release:
types:
- created

jobs:
release:
Expand All @@ -24,21 +24,9 @@ jobs:
- name: Build
run: |
# Add commands to build and test your package
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
- name: Tag release
id: tag
run: |
git tag v3.12.2 # Replace with your desired version number
echo "::set-output name=tag::v3.12.2" # Replace with the same version number as above
- name: Push tag
uses: ad-m/github-push-action@v0.6.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ steps.tag.outputs.tag }}
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 15'
- name: CocoaPods trunk push
run: pod trunk push
run: pod trunk push --allow-warnings
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
11 changes: 11 additions & 0 deletions .github/workflows/sast-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: SAST Scan
on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
security-sast:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Semgrep Scan
run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v "${PWD}:/src" returntocorp/semgrep semgrep scan --config auto
9 changes: 8 additions & 1 deletion .talismanrc
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
threshold: medium
fileignoreconfig:
- filename: Contentstack.xcodeproj/project.pbxproj
checksum: 10cb4bc5ca755f7392309a88cd6df510a45f8c527ea2f8edc71e1ae1fda60941
- filename: .github/workflows/sast-scan.yml
checksum: 5554abc81d130557f52d64d253c3a23b41fcf0642a9c599131b2c185665ce581
- filename: PrivacyInfo.xcprivacy
checksum: 7697fa6a0a5e0600d35d4678ffff9ef14c5dff5dc1613d37968de7ded3ff1fd0
version: ""
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
### Version: 3.12.3
#### Date: May-16-2023

##### Enhancement:
- Added support for GCP_NA region

### Version: 3.12.2
#### Date: Mar-22-2024

##### Bug Fix:
- fixed issue while importing headers

### Version: 3.12.1
#### Date: Feb-01-2024

##### Enhancement:
- Retry URL request on 408, 429 errors

### Version: 3.12.0
#### Date: May-26-2023

Expand Down
6 changes: 3 additions & 3 deletions Contentstack.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Pod::Spec.new do |s|
s.name = 'Contentstack'
s.version = '3.12.1'
s.version = '3.13.0'
s.summary = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'

s.description = <<-DESC
Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content.
Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content.
In a world where content is consumed via countless channels and form factors across mobile, web and IoT. Contentstack reimagines content management by decoupling code from content. Business users manage content – no training or development required. Developers can create cross-platform apps and take advantage of a headless CMS that delivers content through APIs. With an architecture that’s extensible – but without the bloat of legacy CMS – Contentstack cuts down on infrastructure, maintenance, cost and complexity.
DESC

s.homepage = 'https://www.contentstack.com/'
s.license = { :type => 'Commercial',:text => 'See https://www.contentstack.com/'}
s.author = { 'Contentstack' => 'support@contentstack.io' }

s.source = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.12.1' }
s.source = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.13.0' }
s.social_media_url = 'https://twitter.com/Contentstack'

s.ios.deployment_target = '11.0'
Expand Down
Loading

0 comments on commit 1ebf6e4

Please sign in to comment.