Skip to content

Development #57

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

Merged
merged 25 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
473b2f0
changes made as suggested
reeshika-h Nov 3, 2024
c626291
minor changes
reeshika-h Nov 6, 2024
8742553
minor changes
reeshika-h Nov 6, 2024
58a9223
minor change
reeshika-h Nov 6, 2024
ebb3919
Merge pull request #55 from contentstack/fix/DX-1400-GH-issue
reeshika-h Nov 7, 2024
ceff54a
Contentstack-swift-dvr package has been added
reeshika-h Jan 3, 2025
9428db6
Added a step to resolve dependencies before running snyk
reeshika-h Jan 3, 2025
1f4dbda
Added pkg token for accessing private repos
reeshika-h Jan 3, 2025
21a5829
changes made to handle [email protected] URLs
reeshika-h Jan 3, 2025
b138ad9
changes made since facing errors
reeshika-h Jan 3, 2025
212a6eb
fix changes 1
reeshika-h Jan 6, 2025
2a1a5d6
fix: changes 2
reeshika-h Jan 6, 2025
78eb480
fix: changes 3
reeshika-h Jan 6, 2025
0e086ec
fix : changes 4
reeshika-h Jan 6, 2025
4be65c9
Update sca-scan.yml
aravindbuilt Jan 7, 2025
47af133
Update sca-scan.yml
aravindbuilt Jan 7, 2025
d7ce344
Adding the cartfile back, since certain workflows in the repo use Car…
reeshika-h Jan 7, 2025
dbf9de4
added secrets in the workflow
reeshika-h Jan 9, 2025
1fe95f3
correction made
reeshika-h Jan 9, 2025
7a14470
changes made in simulator configuration
reeshika-h Jan 10, 2025
3492718
changes 1
reeshika-h Jan 10, 2025
68a8ad8
changes 2
reeshika-h Jan 10, 2025
dddbd89
Merge pull request #59 from contentstack/fix/DX-963-ci-workflow
reeshika-h Jan 13, 2025
7b8f2ac
updated the url for swift utils sdk
reeshika-h Jan 17, 2025
b3b17b4
Merge pull request #58 from contentstack/feat/DX-1568-dvr-package-alt
reeshika-h Jan 17, 2025
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
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ jobs:
with:
xcode-version: '15.4.0'

- name: Create config file
run: |
echo '{
"api_key": "${{ secrets.api_key }}",
"delivery_token": "${{ secrets.delivery_token }}",
"environment": "${{ secrets.environment }}"
}' > Tests/config.json

- name: Build and run tests
run: |
xcodebuild test \
Expand Down Expand Up @@ -62,13 +70,21 @@ jobs:
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4.0'

- name: Create config file
run: |
echo '{
"api_key": "${{ secrets.api_key }}",
"delivery_token": "${{ secrets.delivery_token }}",
"environment": "${{ secrets.environment }}"
}' > Tests/config.json

- name: Build and run tests
run: |
xcodebuild test \
-workspace Contentstack.xcworkspace \
-scheme "Contentstack iOS Tests" \
-destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
-sdk iphonesimulator \
ONLY_ACTIVE_ARCH=NO \
CODE_SIGNING_ALLOWED=NO
9 changes: 9 additions & 0 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ jobs:
steps:
- uses: actions/checkout@master
- uses: snyk/actions/setup@master
- name: Configure Git credentials
run: |
git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/"

- name: Resolve Swift package dependencies
run: swift package resolve
- name: Run Snyk to check for vulnerabilities
run: snyk test --all-projects --fail-on=all
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Cleanup credentials
if: always()
run: rm -f ~/.gitconfig
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "venmo/DVR"
github "contentstack/contentstack-utils-swift.git"
github "contentstack/contentstack-swift-dvr" "master"
github "contentstack/contentstack-utils-swift"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "vkalta/DVR" "8bb79349473d1ff595f07d216662ee5163854f42"
github "vkalta/contentstack-utils-swift" "dacaf16bd8e4e182e0bef57df2957c7c8697082c"
github "contentstack/contentstack-swift-dvr" "c8040a2451e4bc2c312347531cac6c73f23ce50c"
github "contentstack/contentstack-utils-swift" "v1.3.4"
Loading
Loading