Skip to content

Commit 8869b37

Browse files
committed
Merge branch 'main' into feat/add-swift-log-integration
2 parents 2077ce0 + 0af71b2 commit 8869b37

File tree

116 files changed

+950
-960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+950
-960
lines changed

.github/file-filters.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ run_version_bump_util_for_prs: &run_version_bump_util_for_prs
425425

426426
# Project files with version info
427427
- "Sentry.podspec"
428-
- "SentryPrivate.podspec"
429428
- "SentrySwiftUI.podspec"
430429
- "Package*.swift"
431430
- "Tests/HybridSDKTest/HybridPod.podspec"

.github/workflows/assemble-xcframework-variant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- uses: actions/checkout@v6
7373

7474
- name: Setup Ruby
75-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
75+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
7676
if: ${{ inputs.signed }}
7777
with:
7878
bundler-cache: true

.github/workflows/auto-update-tools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
git diff HEAD
8383
8484
- name: Create pull request for clang-format version
85-
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 #v7.0.9
85+
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 #v7.0.11
8686
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
8787
with:
8888
add-paths: scripts/.clang-format-version
@@ -94,7 +94,7 @@ jobs:
9494
base: main
9595

9696
- name: Create pull request for swiftlint version
97-
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 #v7.0.9
97+
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 #v7.0.11
9898
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
9999
with:
100100
add-paths: scripts/.swiftlint-version

.github/workflows/benchmarking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v6
4444
- run: ./scripts/ci-select-xcode.sh 26.1.1
4545
- name: Setup Ruby
46-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
46+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
4747
with:
4848
bundler-cache: true
4949
- run: make init-ci-build

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464

6565
- run: ./scripts/ci-select-xcode.sh 16.4
6666
- name: Setup Ruby
67-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
67+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
6868
with:
6969
bundler-cache: true
7070
- run: make init-ci-build

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: ./scripts/ci-select-xcode.sh 16.4
4747

4848
- name: Setup Ruby
49-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
49+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
5050
with:
5151
bundler-cache: true
5252

.github/workflows/objc-conversion-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/checkout@v6
4848

4949
- name: Setup Ruby
50-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
50+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
5151
with:
5252
ruby-version: "3.2"
5353
bundler-cache: true

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ jobs:
267267
uses: actions/checkout@v6
268268
- run: ./scripts/ci-select-xcode.sh 16.4
269269
- name: Setup Ruby
270-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
270+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
271271
with:
272272
bundler-cache: true
273273
- uses: actions/cache@v4
@@ -328,7 +328,7 @@ jobs:
328328
steps:
329329
- name: Get auth token
330330
id: token
331-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
331+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
332332
with:
333333
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
334334
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/size-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: ./scripts/ci-select-xcode.sh 16.4
4646

4747
- name: Setup Ruby
48-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
48+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
4949
with:
5050
bundler-cache: true
5151

.github/workflows/testflight.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v6
4444
- run: ./scripts/ci-select-xcode.sh 16.4
4545
- name: Setup Ruby
46-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
46+
uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0
4747
with:
4848
bundler-cache: true
4949

0 commit comments

Comments
 (0)