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

Merge release/7.84.2 into release/7.85 #3805

Merged
merged 27 commits into from
Mar 21, 2025

Conversation

wpmobilebot
Copy link
Collaborator

Merging release/7.84.2 into release/7.85.

Via intermediate branch merge/release-7.84.2-into-release-7.85, to help fix conflicts if any:

                          release/7.84.2  ----o-- - - -
                                               \
  merge/release-7.84.2-into-release-7.85        `---.
                                                     \
                            release/7.85  ------------x- - -

@wpmobilebot wpmobilebot requested a review from a team as a code owner March 21, 2025 16:59
@wpmobilebot wpmobilebot removed the request for review from a team March 21, 2025 16:59
@wpmobilebot wpmobilebot requested a review from mebarbosa March 21, 2025 16:59
@wpmobilebot wpmobilebot added this to the 7.85 ❄️ milestone Mar 21, 2025
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

wpmobilebot commented Mar 21, 2025

📲 You can test the changes from this Pull Request in 📱 Mobile by scanning the QR code below to install the corresponding build.
App Name 📱 Mobile
Build TypedebugProd
Commitf94db78
Direct Downloadpocketcasts-app-prototype-build-pr3805-f94db78.apk
📲 You can test the changes from this Pull Request in 🚗 Automotive by scanning the QR code below to install the corresponding build.
App Name 🚗 Automotive
Build TypedebugProd
Commitf94db78
Direct Downloadpocketcasts-automotive-prototype-build-pr3805-f94db78.apk
📲 You can test the changes from this Pull Request in ⌚ Wear by scanning the QR code below to install the corresponding build.
App Name ⌚ Wear
Build TypedebugProd
Commitf94db78
Direct Downloadpocketcasts-wear-prototype-build-pr3805-f94db78.apk

@wpmobilebot
Copy link
Collaborator Author

Project manifest changes for app

The following changes in the app's merged AndroidManifest.xml file were detected (build variant: release):

--- ./build/reports/diff_manifest/app/release/base_manifest.txt	2025-03-21 18:31:52.155621316 +0000
+++ ./build/reports/diff_manifest/app/release/head_manifest.txt	2025-03-21 18:32:02.205592819 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="au.com.shiftyjelly.pocketcasts"
-    android:versionCode="9324"
-    android:versionName="7.85-rc-2" >
+    android:versionCode="9325"
+    android:versionName="7.84.2" >
 
     <uses-sdk
         android:minSdkVersion="24"

Go to https://buildkite.com/automattic/pocket-casts-android/builds/11188/canvas?sid=0195b9f6-43d5-4864-825b-15dd86feb55d, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Collaborator Author

Project manifest changes for wear

The following changes in the wear's merged AndroidManifest.xml file were detected (build variant: release):

--- ./build/reports/diff_manifest/wear/release/base_manifest.txt	2025-03-21 18:32:16.555548309 +0000
+++ ./build/reports/diff_manifest/wear/release/head_manifest.txt	2025-03-21 18:32:26.385520064 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="au.com.shiftyjelly.pocketcasts"
-    android:versionCode="9324"
-    android:versionName="7.85-rc-2" >
+    android:versionCode="9325"
+    android:versionName="7.84.2" >
 
     <uses-sdk
         android:minSdkVersion="26"

Go to https://buildkite.com/automattic/pocket-casts-android/builds/11188/canvas?sid=0195b9f6-43d5-4864-825b-15dd86feb55d, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Collaborator Author

Project manifest changes for automotive

The following changes in the automotive's merged AndroidManifest.xml file were detected (build variant: release):

--- ./build/reports/diff_manifest/automotive/release/base_manifest.txt	2025-03-21 18:32:35.975494729 +0000
+++ ./build/reports/diff_manifest/automotive/release/head_manifest.txt	2025-03-21 18:32:45.095468898 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="au.com.shiftyjelly.pocketcasts"
-    android:versionCode="9324"
-    android:versionName="7.85-rc-2" >
+    android:versionCode="9325"
+    android:versionName="7.84.2" >
 
     <uses-sdk
         android:minSdkVersion="28"

Go to https://buildkite.com/automattic/pocket-casts-android/builds/11188/canvas?sid=0195b9f6-43d5-4864-825b-15dd86feb55d, click on the Artifacts tab and audit the files.

@mebarbosa mebarbosa enabled auto-merge (squash) March 21, 2025 18:38
@mebarbosa mebarbosa merged commit c873e09 into release/7.85 Mar 21, 2025
18 checks passed
@mebarbosa mebarbosa deleted the merge/release-7.84.2-into-release-7.85 branch March 21, 2025 18:55
@mebarbosa mebarbosa restored the merge/release-7.84.2-into-release-7.85 branch March 21, 2025 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants