Renaming AOSP’s Master Branch

[Ian Kasprzak]

Hi, 

We are renaming the master branch to main in AOSP today. This is in line with our commitment to using inclusive language in our products and services. We believe this name will be more welcoming to everyone who uses our products.

In addition to the change in the branch name, you’ll notice that the targets on ci.android.com have new build variants named next, trunk_food, and trunk_staging. These variants represent builds with different feature flags, and you can use any of these for your local development (more information about these variants will be made available on source.android.com at a later time).

The legacy master branch will continue to exist in AOSP as a read-only replica of main and will be deleted at some time in the future. We encourage everyone to switch to using main starting today.

For those of you who use codesearch, please note that the source tree for master branch will no longer be updated. Please switch to using main in all your workflows and queries that use codesearch. 

Regards,

The AOSP team

[enh]

looks like ci.android.com doesn't have an aosp-main yet? https://ci.android.com/builds/branches/aosp-main/grid? isn't working for me (and https://ci.android.com/builds/branches/aosp-master/grid? seems out of date, as "promised"?)

it also seems like "main" doesn't show up in the gerrit list of branches in the cherrypick dialog yet? (but does work if you just manually enter it anyway.)

--
--
You received this message because you are subscribed to the "Android Building" mailing list.
To post to this group, send email to android-...@googlegroups.com
To unsubscribe from this group, send email to
android-buildi...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/android-building?hl=en

---
You received this message because you are subscribed to the Google Groups "Android Building" group.
To unsubscribe from this group and stop receiving emails from it, send an email to android-buildi...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/android-building/CAAotq6fV8Ez1_ip_73TZq1iGbx8aAWzSr7WuOuHWAe0X0PUv%3DA%40mail.gmail.com.

[enh]

and the BUILD_ID when i build still says AOSP.MASTER?

```

============================================
PLATFORM_VERSION_CODENAME=VanillaIceCream
PLATFORM_VERSION=VanillaIceCream
PRODUCT_INCLUDE_TAGS=com.android.mainline
TARGET_PRODUCT=aosp_cf_arm64_phone
TARGET_BUILD_VARIANT=userdebug
TARGET_ARCH=arm64
TARGET_ARCH_VARIANT=armv8-a
TARGET_CPU_VARIANT=cortex-a53
TARGET_2ND_ARCH=arm
TARGET_2ND_ARCH_VARIANT=armv8-a
TARGET_2ND_CPU_VARIANT=cortex-a53
HOST_OS=linux
HOST_OS_EXTRA=Linux-6.1.25-1rodete1-amd64-x86_64-Debian-GNU/Linux-rodete
HOST_CROSS_OS=linux_musl
BUILD_ID=AOSP.MASTER
OUT_DIR=out
============================================

```

[Amith Dsouza]

We'll share builds from aosp-main in a few weeks (we're sorry it's a bit delayed).

Thanks for reporting the issue with the BUILD ID we;ll fix that too.

To view this discussion on the web visit https://groups.google.com/d/msgid/android-building/CAJgzZooF9wJ_dEtWCTKO02FsC5Xf12EPKLVzAPVYP1NqYwWkUw%40mail.gmail.com.

[enh]

it seems like the source browser needs updating for main too --- if you look at https://android.googlesource.com/platform/external/toybox/ (say), master is pulled out at the top, but main is hidden under "more..." (and then a lot of scrolling).

To view this discussion on the web visit https://groups.google.com/d/msgid/android-building/CABWpnXhONiNx%2BE1kopRYut8-AYAy1afkxoz2Yr7ovCENq0ZTfQ%40mail.gmail.com.

[Yongqin Liu]

Hi, All

It seems https://ci.android.com/builds/branches/aosp-main/grid? still not ready, or it has a different link now?

[Amith Dsouza]

Hi all,

>It seems https://ci.android.com/builds/branches/aosp-main/grid? still not ready, or it has a different link now?

This is a known issue. We're sorry we couldn;t bring the build  sharing for  aosp-main online at the same time as the re-name of the branch.

We're working on bringing this back online, and we'll post an update here when the build artifact share is ready.

Regards,

[Al Sutton]

I'm not sure if it's handled by the same group, but could "master" be dropped from the public cs.android.com code search site?

At the moment search results over the Android project are generating duplicates (one for main and one for master), for example; android-car - Search

To view this discussion on the web visit https://groups.google.com/d/msgid/android-building/cdfbb675-a363-4326-9797-805b77128ffen%40googlegroups.com.