Skip to content

Commit 5800936

Browse files
committed
Merge branch 'main' into markushi/feat/anr-warning-listener [pr-shepherd]
2 parents 18a3504 + 5e493bd commit 5800936

269 files changed

Lines changed: 6295 additions & 1098 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/workflows/agp-matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
submodules: 'recursive'
3434

3535
- name: Setup Java Version
36-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
36+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
3737
with:
3838
distribution: 'temurin'
3939
java-version: '21'
@@ -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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ concurrency:
1111

1212
jobs:
1313
build:
14-
name: Build Job ubuntu-latest - Java 17
14+
# Job name is a required status check in the main branch ruleset; keep it stable.
15+
name: Build Job ubuntu-latest
1516
runs-on: ubuntu-latest
1617

1718
env:
@@ -25,7 +26,7 @@ jobs:
2526
submodules: 'recursive'
2627

2728
- name: Setup Java Version
28-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
29+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2930
with:
3031
distribution: 'temurin'
3132
java-version: '21'
@@ -61,7 +62,7 @@ jobs:
6162

6263
- name: Upload test results
6364
if: always()
64-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
65+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
6566
with:
6667
name: test-results-build
6768
path: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
submodules: 'recursive'
2626

2727
- name: Setup Java Version
28-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
28+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2929
with:
3030
distribution: 'temurin'
3131
java-version: '21'
@@ -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@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # 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@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # pin@v2

‎.github/workflows/enforce-license-compliance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
1515

1616
- name: Set up Java
17-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
17+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
1818
with:
1919
distribution: 'temurin'
2020
java-version: '21'

‎.github/workflows/format-code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
submodules: 'recursive'
1414

1515
- name: set up JDK 17
16-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
16+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
1717
with:
1818
distribution: 'temurin'
1919
java-version: '21'

‎.github/workflows/generate-javadocs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
submodules: 'recursive'
1515

1616
- name: set up JDK 17
17-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
17+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
1818
with:
1919
distribution: 'temurin'
2020
java-version: '21'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424

2525
- name: 'Set up Java: 17'
26-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
26+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2727
with:
2828
distribution: 'temurin'
2929
java-version: '21'
@@ -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-size.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424

2525
- name: Setup Java Version
26-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
26+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2727
with:
2828
distribution: "temurin"
2929
java-version: "21"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131

3232
- name: Set up Java 17
33-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
33+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
3434
with:
3535
distribution: 'temurin'
3636
java-version: '21'
@@ -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/integration-tests-ui.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
submodules: 'recursive'
2828

2929
- name: 'Set up Java: 17'
30-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
30+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
3131
with:
3232
distribution: 'temurin'
3333
java-version: '21'
@@ -81,11 +81,12 @@ jobs:
8181
# Skip on PRs from forks, which don't have access to the upload secret
8282
if: ${{ !cancelled() && env.SAUCE_USERNAME != null && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
8383
run: |
84-
shopt -s globstar nullglob
85-
pngs=(artifacts/**/*.png)
86-
if [ ${#pngs[@]} -gt 0 ]; then
87-
mkdir -p replay-snapshots
88-
cp "${pngs[@]}" replay-snapshots/
84+
# find instead of `shopt -s globstar`, which macOS's bash 3.2 doesn't support
85+
mkdir -p replay-snapshots
86+
if [ -d artifacts ]; then
87+
find artifacts -type f -name '*.png' -exec cp {} replay-snapshots/ \;
88+
fi
89+
if [ -n "$(ls -A replay-snapshots)" ]; then
8990
sentry-cli snapshots upload ./replay-snapshots \
9091
--app-id sentry-android-replay
9192
else

0 commit comments

Comments
 (0)