Work with the new application-services release process #105

bendk · 2023-03-30T16:41:27Z

Updated the code to handle nightly releases. The release channel is not implemented yet, but I plan to come back and do that once the new nightly system is in place.

I tested this by merging the app-services-nightlies into bendk/firefox-android/main then running the relbot script against it.

Here's the resulting PR: bendk/firefox-android#3

Here's the script output:

2023-03-30 12:38:37,920 - __main__.<module>:106 - INFO - This is relbot working on https://github.com/bendk as sebastian@mozilla.com / MickeyMoz
2023-03-30 12:38:38,080 - util.get_current_ac_version:112 - INFO - Fetched A-C version 113.0a1 from bendk/firefox-android
2023-03-30 12:38:38,080 - android_components._update_application_services:300 - INFO - Updating A-S on bendk/firefox-android:main
2023-03-30 12:38:38,238 - android_components._update_application_services:305 - INFO - Current A-S channel is nightly
2023-03-30 12:38:38,455 - android_components._update_application_services:310 - INFO - Current A-S Nightly version in A-C bendk/firefox-android:main is 113.20230320174514
2023-03-30 12:38:38,879 - android_components._update_application_services:319 - INFO - Latest A-S Nightly version available is 113.20230323131908
2023-03-30 12:38:38,879 - android_components._update_application_services:330 - INFO - We should update A-C main with A-S Nightly 113.20230323131908
2023-03-30 12:38:39,205 - android_components._update_application_services:362 - INFO - Last commit on main is 20957faa4371be9cfd97b4f082a4f35d37e45a26
2023-03-30 12:38:39,550 - android_components._update_application_services:367 - INFO - Created branch relbot/update-as/ac-113 on 20957faa4371be9cfd97b4f082a4f35d37e45a26
2023-03-30 12:38:39,550 - android_components._update_application_services:369 - INFO - Updating android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
2023-03-30 12:38:40,103 - android_components._update_application_services:386 - INFO - Creating pull request
2023-03-30 12:38:41,351 - android_components._update_application_services:393 - INFO - Pull request at https://github.com/bendk/firefox-android/pull/3
2023-03-30 12:38:41,351 - android_components._update_application_services:399 - INFO - Asking Bors to run a try build
2023-03-30 12:38:42,283 - android_components._update_geckoview:168 - INFO - Updating GeckoView on A-C bendk/firefox-android:main
2023-03-30 12:38:42,454 - android_components._update_geckoview:173 - INFO - Current GV channel is nightly
2023-03-30 12:38:42,623 - android_components._update_geckoview:178 - INFO - Current GV Nightly version in A-C bendk/firefox-android:main is 113.0.20230330094555
2023-03-30 12:38:43,476 - android_components._update_geckoview:189 - INFO - Latest GV Nightly version available is 113.0.20230330094555
2023-03-30 12:38:43,668 - android_components._update_geckoview:197 - INFO - Current Glean version in A-C bendk/firefox-android:main is 52.4.2
2023-03-30 12:38:43,771 - android_components._update_geckoview:202 - INFO - Latest bundled Glean version available is 52.4.2
2023-03-30 12:38:43,771 - android_components._update_geckoview:205 - WARNING - No newer GV Nightly release found. Exiting.

bendk · 2023-04-04T20:06:38Z

@JohanLorenzo Do you think this code could work? I'm hoping to get all my PRs ready before the end of the nightly cycle so we can make the swap at the start of the 114 cycle.

JohanLorenzo

The overall logic looks good to me. Thanks for taking care of these changes!

If I'm not mistaken, we'll have to support the old get_latest_as_version() logic for beta and release. Otherwise, we will break these branches. It should be a matter of having this logic:

if as_major_version >= CUTOFF_VERSION:
   # new logic
else:
  # old logic

JohanLorenzo · 2023-04-06T14:22:13Z

src/util.py

+        r.raise_for_status()
+        return r.json()["version"]
+    else:
+        raise NotImplementedError("Only the AS nightly channel is currently supported")


Ah, relbot doesn't "ride the train". Any change we make and release has to be compatible with nightly, beta, and release at once. I'm sorry about this. The good news is: this logic will go away once bug android-to-gecko-repos is done

JohanLorenzo · 2023-04-06T14:29:03Z

src/util.py

+    return match_as_channel(content_file.decoded_content.decode("utf8"))
+
+
+def validate_glean_version(v):


Improvement for a potential followup: we could make glean and application-services part of mozilla-version. This Python library takes care of validating version numbers (historical ones as well as future ones)

bendk · 2023-04-06T17:49:28Z

The overall logic looks good to me. Thanks for taking care of these changes!

If I'm not mistaken, we'll have to support the old get_latest_as_version() logic for beta and release. Otherwise, we will break these branches. It should be a matter of having this logic:

Ahh, I see. I updated the code to handle both cases. It turned out that it was usually easier to check the a-c version than the a-s one. I manually triggered PRs for both the new and legacy case on my firefox-android repo and they looked good to me.

ddurst · 2023-04-18T15:25:06Z

@JohanLorenzo Do you need to r+ the changes?

src/android_components.py

src/util.py

Updated the code to handle nightly releases. The release channel is not implemented yet, but I plan to come back and do that once the new nightly system is in place.

JohanLorenzo

Thank you for taking care of the review, @jcristau! Sorry, I missed that one, 2 weeks ago.

bendk · 2023-04-19T15:03:51Z

I'm not sure this one is ready to merge because there's also related app-services and firefox-android PRs. They all need to be merged together for the new system to work. I'm hoping to get those merged today, but I'm not sure about that. If they don't get merged, then I think the android-components bump tomorrow may fail.

I'll definitely update you with the status before eastern time EOD. Sorry for not mentioning this earlier, I'm not used to juggling so many PRs.

jcristau · 2023-04-19T15:08:24Z

@bendk firefox-android pins a specific tag of relbot (https://github.com/mozilla-mobile/firefox-android/blob/c1add9b7278852b5d80a5a3750a6d811d928828f/.github/workflows/ac-update-geckoview.yml#L32), so it shouldn't matter when this gets merged, we can make a relbot release and then include a bump of the relbot version in the firefox-android PR.

bendk · 2023-04-19T15:14:19Z

Ahh, very nice.

Could you make a release with this change? Once that's done, I'll update my firefox-android PR to include the bump.

jcristau · 2023-04-19T15:22:21Z

Done: https://github.com/mozilla-mobile/relbot/releases/tag/6.1.0

This was referenced Mar 30, 2023

Bug 1823462 - New application-services release system mozilla-mobile/firefox-android#1325

Merged

New versioning system [preview nightly] mozilla/application-services#5408

Merged

JohanLorenzo reviewed Apr 6, 2023

View reviewed changes

bendk force-pushed the new-as-releases branch from 1cd9bff to fa738b8 Compare April 6, 2023 17:47

jcristau reviewed Apr 18, 2023

View reviewed changes

src/android_components.py Outdated Show resolved Hide resolved

src/util.py Outdated Show resolved Hide resolved

Work with the new application-services release process

31690ba

Updated the code to handle nightly releases. The release channel is not implemented yet, but I plan to come back and do that once the new nightly system is in place.

bendk force-pushed the new-as-releases branch from fa738b8 to 31690ba Compare April 18, 2023 17:52

jcristau approved these changes Apr 19, 2023

View reviewed changes

JohanLorenzo reviewed Apr 19, 2023

View reviewed changes

jcristau merged commit 0bc1f9e into mozilla-mobile:master Apr 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Work with the new application-services release process #105

Work with the new application-services release process #105

bendk commented Mar 30, 2023

bendk commented Apr 4, 2023

JohanLorenzo left a comment

JohanLorenzo Apr 6, 2023

JohanLorenzo Apr 6, 2023

bendk commented Apr 6, 2023

ddurst commented Apr 18, 2023

JohanLorenzo left a comment

bendk commented Apr 19, 2023

jcristau commented Apr 19, 2023

bendk commented Apr 19, 2023

jcristau commented Apr 19, 2023

		return match_as_channel(content_file.decoded_content.decode("utf8"))


		def validate_glean_version(v):

Work with the new application-services release process #105

Work with the new application-services release process #105

Conversation

bendk commented Mar 30, 2023

bendk commented Apr 4, 2023

JohanLorenzo left a comment

Choose a reason for hiding this comment

JohanLorenzo Apr 6, 2023

Choose a reason for hiding this comment

JohanLorenzo Apr 6, 2023

Choose a reason for hiding this comment

bendk commented Apr 6, 2023

ddurst commented Apr 18, 2023

JohanLorenzo left a comment

Choose a reason for hiding this comment

bendk commented Apr 19, 2023

jcristau commented Apr 19, 2023

bendk commented Apr 19, 2023

jcristau commented Apr 19, 2023