Skip to content

Commit 2c629ba

Browse files
committed
Merge remote-tracking branch 'origin/main' into build/jdk-21
# Conflicts: # .github/workflows/build.yml
2 parents 561324b + e9f7568 commit 2c629ba

138 files changed

Lines changed: 4417 additions & 417 deletions

File tree

Some content is hidden

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

‎.github/actionlint.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Custom runner labels for actionlint (same approach as sentry-cocoa).
2+
self-hosted-runner:
3+
labels:
4+
- bitrise_pool_name:tahoe

‎.github/workflows/agp-matrix.yml‎

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

9595
- name: Upload test results
9696
if: always()
97-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
97+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
9898
with:
9999
name: test-results-AGP${{ matrix.agp }}-Integrations${{ matrix.integrations }}
100100
path: |

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ concurrency:
1111

1212
jobs:
1313
build:
14-
name: Build Job ubuntu-latest
15-
runs-on: ubuntu-latest
14+
# Job name is a required status check in the main branch ruleset; keep it stable.
15+
name: Build Job ubuntu-latest - Java 17
16+
# Runs on Bitrise-hosted runners (same pattern as sentry-cocoa) instead of
17+
# GitHub-hosted ubuntu-latest, which ran out of memory during `make preMerge`.
18+
runs-on: ["bitrise_pool_name:tahoe"]
1619

1720
env:
1821
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -61,7 +64,7 @@ jobs:
6164

6265
- name: Upload test results
6366
if: always()
64-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
67+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
6568
with:
6669
name: test-results-build
6770
path: |

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # pin@v2
39+
uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # pin@v2
48+
uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # pin@v2

‎.github/workflows/integration-tests-macrobenchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
--json-out ./artifacts/benchmarkData.json | tee -a "$GITHUB_STEP_SUMMARY"
5858
5959
- name: Upload Sauce artifacts
60-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
60+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
6161
if: ${{ !cancelled() }}
6262
with:
6363
name: macrobenchmark-results

‎.github/workflows/integration-tests-ui-critical.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: make assembleUiTestCriticalRelease
4545

4646
- name: Upload APK artifact
47-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
47+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
4848
with:
4949
name: ${{env.APK_ARTIFACT_NAME}}
5050
path: "${{env.BASE_PATH}}/${{env.BUILD_PATH}}/${{env.APK_NAME}}"
@@ -137,7 +137,7 @@ jobs:
137137
script: echo "Generated AVD snapshot for caching."
138138

139139
- name: Download APK artifact
140-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
140+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8
141141
with:
142142
name: ${{env.APK_ARTIFACT_NAME}}
143143

@@ -164,7 +164,7 @@ jobs:
164164
165165
- name: Upload Maestro test results
166166
if: ${{ always() }}
167-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
167+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
168168
with:
169169
name: maestro-logs-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
170170
path: "${{env.BASE_PATH}}/maestro-logs"

‎.github/workflows/release-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: make publish
3333

3434
- name: Upload artifacts
35-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
35+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
3636
with:
3737
name: ${{ github.sha }}
3838
if-no-files-found: error

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 0
3535
submodules: 'recursive'
3636
- name: Prepare release
37-
uses: getsentry/craft@d5039704fa236d5e7c7a3ff12862238b65d18385 # v2.33.2
37+
uses: getsentry/craft@3f2abdc5703191d12ef2cc013f792f1bd220f44d # v2.34.1
3838
env:
3939
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4040
with:

‎.github/workflows/spring-boot-2-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
132132
- name: Upload test results
133133
if: always()
134-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
134+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
135135
with:
136136
name: test-results-springboot-2-${{ matrix.springboot-version }}
137137
path: |

‎.github/workflows/spring-boot-3-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
128128
- name: Upload test results
129129
if: always()
130-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
130+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
131131
with:
132132
name: test-results-springboot-3-${{ matrix.springboot-version }}
133133
path: |

0 commit comments

Comments
 (0)