diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b1891ba..93d274a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,19 +11,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v4 + uses: gradle/actions/wrapper-validation@v6 - name: Install JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 - name: Build run: ./gradlew assemble --stacktrace @@ -40,23 +40,23 @@ jobs: sudo udevadm trigger --name-match=kvm - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v4 + uses: gradle/actions/wrapper-validation@v6 - name: Install JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 # Retrieve the cached emulator snapshot. - name: AVD cache - uses: actions/cache@v4 + uses: actions/cache@v6 id: avd-cache with: path: | @@ -66,7 +66,7 @@ jobs: - name: Create AVD and generate snapshot for caching if: steps.avd-cache.outputs.cache-hit != 'true' - uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # v2.34.0 + uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0 with: api-level: 31 arch: x86_64 @@ -77,7 +77,7 @@ jobs: script: echo "Generated AVD snapshot for caching." - name: Run tests - uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # v2.34.0 + uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0 with: api-level: 31 arch: x86_64 @@ -115,23 +115,23 @@ jobs: sudo udevadm trigger --name-match=kvm - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v4 + uses: gradle/actions/wrapper-validation@v6 - name: Install JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 # Retrieve the cached emulator snapshot. - name: AVD cache - uses: actions/cache@v4 + uses: actions/cache@v6 id: avd-cache with: path: | @@ -220,26 +220,45 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'dropbox/dropshots' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' needs: [unitTests] + permissions: + id-token: write + contents: read steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v4 + uses: gradle/actions/wrapper-validation@v6 - name: Install JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 + + - name: Configure AWS credentials (OIDC) + uses: aws-actions/configure-aws-credentials@v6 + with: + role-to-assume: arn:aws:iam::521590706193:role/oidc-github-dropbox-dropshots-branch-main + aws-region: us-west-2 + + - name: Get Maven Central secrets from AWS Secrets Manager + uses: aws-actions/aws-secretsmanager-get-secrets@v3 + with: + secret-ids: | + SONATYPE_USERNAME,sdk-release-maven-central-token-username + SONATYPE_PASSWORD,sdk-release-maven-central-token-password + SIGNING_KEY,sdk-release-signing-key + SIGNING_PASSWORD,sdk-release-signing-password + parse-json-secrets: false - name: Upload Snapshot run: ./gradlew publish --no-daemon --no-parallel --no-configuration-cache --stacktrace env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }} - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }} - ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ env.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ env.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ env.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ env.SIGNING_PASSWORD }} diff --git a/tests/src/androidTest/assets/MatchesActivityScreenshot.png b/tests/src/androidTest/assets/MatchesActivityScreenshot.png index b6ec16c..71090f1 100644 Binary files a/tests/src/androidTest/assets/MatchesActivityScreenshot.png and b/tests/src/androidTest/assets/MatchesActivityScreenshot.png differ diff --git a/tests/src/androidTest/assets/MatchesFullScreenshot.png b/tests/src/androidTest/assets/MatchesFullScreenshot.png index a37c75c..d2af6c9 100644 Binary files a/tests/src/androidTest/assets/MatchesFullScreenshot.png and b/tests/src/androidTest/assets/MatchesFullScreenshot.png differ diff --git a/tests/src/androidTest/assets/MatchesViewScreenshot.png b/tests/src/androidTest/assets/MatchesViewScreenshot.png index 415c49c..2dda90b 100644 Binary files a/tests/src/androidTest/assets/MatchesViewScreenshot.png and b/tests/src/androidTest/assets/MatchesViewScreenshot.png differ