Skip to content

Conversation

@iemejia
Copy link
Member

@iemejia iemejia commented Oct 2, 2023

No description provided.

@github-actions github-actions bot added the build label Oct 2, 2023
@iemejia iemejia requested a review from RyanSkraba October 2, 2023 16:22
Copy link
Contributor

@opwvhk opwvhk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice: saves me typing a couple of keys :)

@iemejia iemejia force-pushed the AVRO-3878-rename-default-branch branch from 16e7e6b to 03a0498 Compare October 2, 2023 19:53
@KalleOlaviNiemitalo
Copy link
Contributor

Other references to the master branch of this repository:

  • doc/:
    • [avro-idl.vim](https://github.com/apache/avro/blob/master/share/editors/avro-idl.vim) in the Avro repository `share/editors` directory (last change in September 2010)
    • For Java code we use [Spotless](https://github.com/diffplug/spotless/) to format the code to comply with Avro's code style conventions (see above). Automatic formatting relies on [Avro's Eclipse JDT formatter definition](https://github.com/apache/avro/blob/master/lang/java/eclipse-java-formatter.xml). You can use the same definition to auto format from Eclipse or from IntelliJ configuring the Eclipse formatter plugin.
    • Changes are normally committed to master first, then, if they're backward-compatible, cherry-picked to a branch.
  • lang/csharp/:
    • # Avro C# [![Build Status](https://travis-ci.org/apache/avro.svg?branch=master)](https://travis-ci.org/apache/avro) [![NuGet Package](https://img.shields.io/nuget/v/Apache.Avro.svg)](https://www.nuget.org/packages/Apache.Avro)
  • lang/php/: I'm not very familiar with PHP but https://getcomposer.org/doc/articles/versions.md#branches seems to say that composer.json uses dev- as a prefix for branches.
    • |[![AVRO](https://raw.githubusercontent.com/apache/avro/master/doc/src/resources/images/avro-logo.png)](https://github.com/apache/avro) | [![AVRO](https://raw.githubusercontent.com/apache/avro/master/doc/src/resources/images/apache_feather.gif)](https://github.com/apac<he/avro)|
    • "apache/avro": "dev-master"
  • lang/py/:
    • License, credits and acknowledgements are maintained in the [LICENSE.txt](https://github.com/apache/avro/blob/master/LICENSE.txt) and [NOTICE.txt](https://github.com/apache/avro/blob/master/NOTICE.txt) in the source code repository. Those files are also included with the installed package.
  • lang/rust/: many
    • [![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg](https://github.com/apache/avro/blob/master/LICENSE.txt)
    • This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
    • All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
    • [![Apache License 2.0](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/apache/avro/blob/master/LICENSE.txt)
    • versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/master/lang/rust/migration_guide.md).
    • This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
    • All contributions will be licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
    • //! versions. If you have troubles upgrading, check the [version upgrade guide](https://github.com/apache/avro/blob/master/lang/rust/migration_guide.md).
    • // See: https://github.com/apache/avro/blob/master/share/test/data/schema-tests.txt

@KalleOlaviNiemitalo
Copy link
Contributor

If PHP users have followed the instructions in lang/php/README.md and copied "apache/avro": "dev-master" into composer.json files in their projects, and the branch is renamed, then will all of those projects fail to build? The GitHub web site can redirect to the new name of the branch but I don't know whether redirection works with Composer too.

@iemejia
Copy link
Member Author

iemejia commented Oct 3, 2023

Thanks for pointing out the missing instances. I somehow had a filter on my IDE for .github and missed all the others 🤦 !
For the php case I am going to go preventive and rename it to dev-main.

Copy link
Contributor

@RyanSkraba RyanSkraba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM -- just the one commented URL needs to be restored, and go ahead and merge when you're ready!

I'm glad to make this change. My fingers' muscle memory has definitely also switched my "default" branch to main!

@iemejia iemejia force-pushed the AVRO-3878-rename-default-branch branch 2 times, most recently from 638e820 to e503e2d Compare October 4, 2023 12:19
@iemejia iemejia marked this pull request as ready for review October 4, 2023 12:19
@iemejia iemejia force-pushed the AVRO-3878-rename-default-branch branch from e503e2d to e05afd2 Compare October 4, 2023 14:15
@iemejia iemejia merged commit 4ec81bd into apache:main Oct 5, 2023
@iemejia iemejia deleted the AVRO-3878-rename-default-branch branch October 6, 2023 00:06
RanbirK pushed a commit to RanbirK/avro that referenced this pull request May 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants