Skip to content

Merge release 2.34 changes into develop #22634

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

Merged
merged 10 commits into from
Jul 9, 2025
Merged

Conversation

vkjr
Copy link
Contributor

@vkjr vkjr commented Jul 3, 2025

Merge changes from release branch

@vkjr vkjr self-assigned this Jul 3, 2025
@vkjr vkjr requested a review from jakubgs as a code owner July 3, 2025 11:22
@vkjr vkjr force-pushed the 2.34-release-copy-2 branch from ae98012 to c0d08e5 Compare July 3, 2025 11:22
@status-im-auto
Copy link
Member

status-im-auto commented Jul 3, 2025

Jenkins Builds

Click to see older builds (6)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ c0d08e5 #2 2025-07-03 11:27:41 ~4 min tests 📄log
✔️ c0d08e5 #2 2025-07-03 11:28:32 ~5 min android-e2e 🤖apk 📲
✔️ c0d08e5 #2 2025-07-03 11:30:35 ~7 min android 🤖apk 📲
c0d08e5 #2 2025-07-03 11:31:24 ~8 min ios 📄log
c0d08e5 #3 2025-07-03 11:38:00 ~1 min ios 📄log
c0d08e5 #4 2025-07-07 07:51:18 ~2 min ios 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
3936e3a #5 2025-07-09 10:19:18 ~2 min ios 📄log
✔️ 3936e3a #3 2025-07-09 10:19:35 ~3 min tests 📄log
fc4f5a4 #6 2025-07-09 10:24:28 ~2 min ios 📄log
✔️ fc4f5a4 #4 2025-07-09 10:24:41 ~2 min tests 📄log
✔️ fc4f5a4 #5 2025-07-09 10:26:53 ~5 min android-e2e 🤖apk 📲
✔️ fc4f5a4 #4 2025-07-09 10:27:09 ~5 min android 🤖apk 📲
fc4f5a4 #7 2025-07-09 10:35:41 ~3 min ios 📄log
fc4f5a4 #8 2025-07-09 10:45:42 ~4 min ios 📄log

@vkjr vkjr requested a review from siddarthkay July 3, 2025 11:28
@vkjr
Copy link
Contributor Author

vkjr commented Jul 3, 2025

@siddarthkay, I want to merge the changes from release branch to develop. There were also your Jenkins-related commits. Are the safe to merge?

Also could you please check the ios build? 🙏

@siddarthkay
Copy link
Contributor

@vkjr : safe to merge that commit.
I'll check why iOS is failing.

@siddarthkay
Copy link
Contributor

hmm this is new


[2025-07-07T07:51:04.241Z] /Users/jenkins/.bundle/ruby/3.1.0/gems/fastlane-
2.217.0/spaceship/lib/spaceship/connect_api/api_client.rb:223:in `handle_response': 
[!] The provided entity includes an unknown attribute - 
'templateName' is not an attribute on the resource 'profiles' - 
/data/attributes/templateName (Spaceship::UnexpectedResponse)

@vkjr
Copy link
Contributor Author

vkjr commented Jul 7, 2025

@siddarthkay, is it somehow related to the PR content?

@siddarthkay siddarthkay force-pushed the 2.34-release-copy-2 branch from c0d08e5 to fc4f5a4 Compare July 9, 2025 10:16
@siddarthkay
Copy link
Contributor

@vkjr : I just now checked and its not related to my changes.

@siddarthkay siddarthkay force-pushed the 2.34-release-copy-2 branch from 3936e3a to fc4f5a4 Compare July 9, 2025 10:21
@vkjr
Copy link
Contributor Author

vkjr commented Jul 9, 2025

@siddarthkay, can you please merge it then, please? (I do not have a right to merge without iOS build results)

@siddarthkay siddarthkay merged commit fc4f5a4 into develop Jul 9, 2025
4 of 5 checks passed
@siddarthkay siddarthkay deleted the 2.34-release-copy-2 branch July 9, 2025 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants