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

bump Sentry cocoa 8.40.1 #360

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft
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
65 changes: 35 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,24 @@ jobs:
timeout-minutes: 15
steps:
- name: Check out current commit (${{ github.sha }})
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
# we use a hash of yarn.lock as our cache key, because if it hasn't changed, our dependencies haven't changed,
# so no need to reinstall them
with:
node-version: 18 # Specify the Node.js version explicitly
- name: Compute dependency cache key
id: compute_lockfile_hash
run: echo "hash=${{ hashFiles('yarn.lock') }}" >> "$GITHUB_OUTPUT"
run: echo "hash=${{ hashFiles('./yarn.lock') }}" >> "$GITHUB_OUTPUT"
- name: Check dependency cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
id: cache_dependencies
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ steps.compute_lockfile_hash.outputs.hash }}
- name: Install dependencies
if: steps.cache_dependencies.outputs.cache-hit == ''
if: steps.cache_dependencies.outputs.cache-hit != 'true'
run: yarn install
outputs:
dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
Expand All @@ -53,16 +55,18 @@ jobs:
runs-on: macos-latest
steps:
- name: Check out current commit (${{ github.sha }})
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
- name: Check dependency cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Check build cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_BUILD_PATHS }}
key: ${{ env.BUILD_CACHE_KEY }}
Expand All @@ -76,16 +80,18 @@ jobs:
timeout-minutes: 15
steps:
- name: Check out current commit (${{ github.sha }})
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
- name: Check dependency cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
- name: Check build cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
id: cache_built_packages
with:
path: ${{ env.CACHED_BUILD_PATHS }}
Expand All @@ -95,11 +101,10 @@ jobs:
# packages, and so `yarn build` should always run. This `if` check is therefore only there for testing CI issues
# where the built packages are beside the point. In that case, you can change `BUILD_CACHE_KEY` (at the top of
# this file) to a constant and skip rebuilding all of the packages each time CI runs.
if: steps.cache_built_packages.outputs.cache-hit == ''
if: steps.cache_built_packages.outputs.cache-hit != 'true'
run: yarn build
# yarn.lock cannot be dirty when releasing a new version.
- name: Check if yarn.lock is dirty
if: steps.cache_built_packages.outputs.cache-hit == ''
if: steps.cache_built_packages.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile

outputs:
Expand All @@ -109,22 +114,22 @@ jobs:

job_carthage_build:
name: Build Carthage Dependencies
runs-on: macos-latest
runs-on: macos-15
timeout-minutes: 30
steps:
- name: Check out current commit (${{ github.sha }})
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check Carthage build cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
id: cache_built_carthage
with:
path: ${{ env.CACHED_CARTHAGE_PATHS }}
key: ${{ hashFiles('src/ios/Cartfile') }}
- name: Install Carthage
if: steps.cache_built_carthage.outputs.cache-hit == ''
if: steps.cache_built_carthage.outputs.cache-hit != 'true'
run: brew install carthage
- name: Build Cocoa SDK from Carthage
if: steps.cache_built_carthage.outputs.cache-hit == ''
if: steps.cache_built_carthage.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
run: make build
Expand All @@ -135,21 +140,23 @@ jobs:
runs-on: macos-latest
steps:
- name: Check out current commit (${{ github.sha }})
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
- name: Check dependency cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Check build cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_BUILD_PATHS }}
key: ${{ env.BUILD_CACHE_KEY }}
- name: Check Carthage build cache
uses: actions/cache@v3.2.5
uses: actions/cache@v4
with:
path: ${{ env.CACHED_CARTHAGE_PATHS }}
key: ${{ hashFiles('src/ios/Cartfile') }}
Expand All @@ -173,8 +180,7 @@ jobs:
shell: pwsh
steps:
- name: Checkout
uses: actions/checkout@v3

uses: actions/checkout@v4
- name: Download test app artifact
uses: actions/download-artifact@v4
with:
Expand All @@ -186,11 +192,10 @@ jobs:
cd ${{ github.workspace }}/artifact
$bundleName = (Get-Item *.tgz).Name
tar -xvzf "$bundleName"

- name: Check if package contains any Symlink
run: |
$symLinks = (find "${{ github.workspace }}" -type l -ls)
if ($null -ne $symLinks) {
Write-Error "Atfifact contains illegal SymLinks`n$symLinks"
Write-Error "Artifact contains illegal Symlinks`n$symLinks"
}
Write-Output "No Symbolic Links found, all good :)"
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Changelog
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- run: npx danger ci
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

## Unreleased

### Dependencies

- build(ios): Bump `sentry-cocoa` to 8.40.1 ([#360](https://github.com/getsentry/sentry-cordova/pull/352))
- [changelog](https://github.com/getsentry/sentry-cocoa/releases/tag/8.40.1)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.1...8.40.1)
- Bump Android SDK from v7.14.0 to v7.17.0 ([#359](https://github.com/getsentry/sentry-cordova/pull/359))
- [changelog](https://github.com/getsentry/sentry-java/blob/7.17.0/CHANGELOG.md)
- [diff](https://github.com/getsentry/sentry-java/compare/7.14.0...7.17.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
build:
cd src/ios; carthage update --use-xcframeworks --platform ios; carthage build --use-xcframeworks --no-use-binaries --platform ios; rm -r Carthage/Build/SentrySwiftUI.xcframework
cd src/ios; carthage update --use-xcframeworks --platform ios; carthage build --use-xcframeworks --no-use-binaries --platform ios; rm -f Carthage/Build/SentrySwiftUI.xcframework
2 changes: 1 addition & 1 deletion src/ios/Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "getsentry/sentry-cocoa" "8.36.0"
github "getsentry/sentry-cocoa" "8.40.1"
Loading