Skip to content

Commit 8a3cf91

Browse files
reeshika-hreeshika-h
authored
Merge pull request #77 from contentstack/staging
back merge
2 parents a6f46bf + 4c35c07 commit 8a3cf91

23 files changed

Lines changed: 138 additions & 2817 deletions

‎.github/workflows/check-branch.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Comment PR
11-
if: github.base_ref == 'master' && github.head_ref != 'next'
11+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1212
uses: thollander/actions-comment-pull-request@v2
1313
with:
1414
message: |
15-
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
15+
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
1616
- name: Check branch
17-
if: github.base_ref == 'master' && github.head_ref != 'next'
17+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1818
run: |
19-
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
19+
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
2020
exit 1

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "Contentstack CI"
22

33
on:
44
push:
5-
branches: [ master, next ]
5+
branches: [ master, staging ]
66
pull_request:
7-
branches: [ master, next ]
7+
branches: [ master, staging ]
88

99
jobs:
1010
macOS:
@@ -46,8 +46,8 @@ jobs:
4646
- name: Build and run tests
4747
run: |
4848
xcodebuild test \
49-
-workspace Contentstack.xcworkspace \
50-
-scheme "Contentstack macOS Tests" \
49+
-workspace ContentstackSwift.xcworkspace \
50+
-scheme "ContentstackSwift macOS Tests" \
5151
-destination 'platform=macOS,arch=arm64' \
5252
ONLY_ACTIVE_ARCH=NO \
5353
CODE_SIGNING_ALLOWED=NO
@@ -86,13 +86,13 @@ jobs:
8686
"delivery_token": "${{ secrets.delivery_token }}",
8787
"environment": "${{ secrets.environment }}"
8888
}' > Tests/config.json
89-
89+
9090
- name: Build and run tests
9191
run: |
92-
xcodebuild test \
93-
-workspace Contentstack.xcworkspace \
94-
-scheme "Contentstack iOS Tests" \
95-
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
96-
-sdk iphonesimulator \
97-
ONLY_ACTIVE_ARCH=NO \
98-
CODE_SIGNING_ALLOWED=NO
92+
xcodebuild test \
93+
-workspace ContentstackSwift.xcworkspace \
94+
-scheme "ContentstackSwift iOS Tests" \
95+
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \
96+
-sdk iphonesimulator \
97+
ONLY_ACTIVE_ARCH=NO \
98+
CODE_SIGNING_ALLOWED=NO

‎.github/workflows/issues-jira.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Create Jira Ticket for Github Issue
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
jobs:
8+
issue-jira:
9+
runs-on: ubuntu-latest
10+
steps:
11+
12+
- name: Login to Jira
13+
uses: atlassian/gajira-login@master
14+
env:
15+
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
16+
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
17+
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
18+
19+
- name: Create Jira Issue
20+
id: create_jira
21+
uses: atlassian/gajira-create@master
22+
with:
23+
project: ${{ secrets.JIRA_PROJECT }}
24+
issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
25+
summary: Github | Issue | ${{ github.event.repository.name }} | ${{ github.event.issue.title }}
26+
description: |
27+
*GitHub Issue:* ${{ github.event.issue.html_url }}
28+
29+
*Description:*
30+
${{ github.event.issue.body }}
31+
fields: "${{ secrets.ISSUES_JIRA_FIELDS }}"

‎.github/workflows/jira.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.github/workflows/policy-scan.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Checks the security policy and configurations
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security-policy:
7+
if: github.event.repository.visibility == 'public'
8+
runs-on: ubuntu-latest
9+
defaults:
10+
run:
11+
shell: bash
12+
steps:
13+
- uses: actions/checkout@master
14+
- name: Checks for SECURITY.md policy file
15+
run: |
16+
if ! [[ -f "SECURITY.md" || -f ".github/SECURITY.md" ]]; then exit 1; fi
17+
security-license:
18+
if: github.event.repository.visibility == 'public'
19+
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
shell: bash
23+
steps:
24+
- uses: actions/checkout@master
25+
- name: Checks for License file
26+
run: |
27+
expected_license_files=("LICENSE" "LICENSE.txt" "LICENSE.md" "License.txt")
28+
license_file_found=false
29+
current_year=$(date +"%Y")
30+
31+
for license_file in "${expected_license_files[@]}"; do
32+
if [ -f "$license_file" ]; then
33+
license_file_found=true
34+
# check the license file for the current year, if not exists, exit with error
35+
if ! grep -q "$current_year" "$license_file"; then
36+
echo "License file $license_file does not contain the current year."
37+
exit 2
38+
fi
39+
break
40+
fi
41+
done
42+
43+
if [ "$license_file_found" = false ]; then
44+
echo "No license file found. Please add a license file to the repository."
45+
exit 1
46+
fi

‎.github/workflows/sast-scan.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/secrets-scan.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Secrets Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security-secrets:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
with:
11+
fetch-depth: '2'
12+
ref: '${{ github.event.pull_request.head.ref }}'
13+
- run: |
14+
git reset --soft HEAD~1
15+
- name: Install Talisman
16+
run: |
17+
# Download Talisman
18+
wget https://github.com/thoughtworks/talisman/releases/download/v1.37.0/talisman_linux_amd64 -O talisman
19+
20+
# Checksum verification
21+
checksum=$(sha256sum ./talisman | awk '{print $1}')
22+
if [ "$checksum" != "8e0ae8bb7b160bf10c4fa1448beb04a32a35e63505b3dddff74a092bccaaa7e4" ]; then exit 1; fi
23+
24+
# Make it executable
25+
chmod +x talisman
26+
- name: Run talisman
27+
run: |
28+
# Run Talisman with the pre-commit hook
29+
./talisman --githook pre-commit

‎.talismanrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
fileignoreconfig:
2+
- filename: .github/workflows/secrets-scan.yml
3+
ignore_detectors:
4+
- filecontent
25
- filename: Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack macOS.xcscheme
36
checksum: 0f51b502dfb1608309256d8d7afa1395bb7cc7e1f7e7b46ea0843f86672c59b5
47
- filename: Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme

‎Contentstack.xcodeproj/ContentstackTests_Info.plist‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Contentstack.xcodeproj/Contentstack_Info.plist‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)