This commit is contained in:
Wes Haggard 2021-06-24 22:24:14 -07:00 коммит произвёл GitHub
Родитель da4368ea07
Коммит b832552cc7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
12 изменённых файлов: 45 добавлений и 49 удалений

2
.github/CODEOWNERS поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
# Instructions for CODEOWNERS file format and automatic build failure notifications:
# https://github.com/Azure/azure-sdk/blob/master/docs/policies/opensource.md#codeowners
# https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners
###########
# SDK

Просмотреть файл

@ -50,14 +50,14 @@ Merging Pull Requests (for project contributors with write access)
- add `MAVEN_HOME` to environment variables
>**Note:** If you ran into "long path" issue on `Windows`, enable paths longer than 260 characters by: <br><br>
1.- Run this as Administrator on a command prompt:<br>
1.- Run this as Administrator on a command prompt:<br>
`REG ADD HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1`<br>*(might need to type `yes` to override key if it already exists)*<br><br>
2.- Set up `git` by running:<br> `git config --system core.longpaths true`
### Building and Unit Testing
Refer to the [build wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning how to build Java SDKs
and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit
and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit
testing.
### Live testing
@ -71,7 +71,7 @@ To see what resources will be deployed for a live service, check the
`test-resources.json` ARM template files in the service you wish to deploy for
testing, for example `sdk\keyvault\test-resources.json`.
To deploy live resources for testing use the steps documented in [`Example 1 of New-TestResources.ps1`](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/common/TestResources/New-TestResources.ps1.md#example-1)
To deploy live resources for testing use the steps documented in [`Example 1 of New-TestResources.ps1`](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/common/TestResources/New-TestResources.ps1.md#example-1)
to set up a service principal and deploy live testing resources.
The script will provide instructions for setting environment variables before
@ -93,7 +93,7 @@ When building locally you might run into a Checkstyle such as the following:
```
Execution default of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0:check failed:
Plugin org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0 or one of its dependencies could not be resolved:
Plugin org.apache.maven.plugins:maven-checkstyle-plugin:3.1.0 or one of its dependencies could not be resolved:
Could not find artifact com.azure:sdk-build-tools:jar:1.0.0 in ossrh (https://oss.sonatype.org/content/repositories/snapshots/)
```
@ -105,7 +105,7 @@ All code in the Azure SDKs for Java repository must pass Checkstyle before being
## Versions and versioning
Tooling has been introduced to centralize versioning and help ease the pain of updating artifact versions in POM and README files. Under the eng\versioning directory there exists version text files, one for client ([version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/version_client.txt)) and one for data ([version_data.txt](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/version_data.txt)). The format of the version files is as follows:
Tooling has been introduced to centralize versioning and help ease the pain of updating artifact versions in POM and README files. Under the eng\versioning directory there exists version text files, one for client ([version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt)) and one for data ([version_data.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_data.txt)). The format of the version files is as follows:
`groupId:artifactId;dependency-version;current-version`
@ -130,7 +130,7 @@ Released Beta Dependency version – This is for when a library, which has alrea
An example of Current vs Dependency versions: `com.azure:azure-storage-blob-batch` has dependencies on `com.azure:azure-core`, `com.azure:azure-core-http-netty` and `com.azure:azure-storage-blob`. Because `com.azure:azure-core` and `com.azure:azure-core-http-netty` are both built outside of azure-storage pipeline we should be using the released or *Dependency* versions of these when they're dependencies of another library. Similarly, libraries built as part of the same pipeline, that have interdependencies, should be using the Current version. Since `com.azure:azure-storage-blob-batch` and `com.azure:azure-storage-blob` are both built part of the azure-batch pipeline when `com.azure:azure-storage-blob` is declared as a dependency of `com.azure:azure-storage-blob-batch` it should be the *Current* version.
An example of an Unreleased Dependency version: Additive, not breaking, API changes have been made to `com.azure:azure-core`. `com.azure:azure-storage-blob` has a dependency on `com.azure:azure-core` and requires the additive API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_<groupId>:<artifactId>;dependency-version`, in this example that would be `unreleased_com.azure:azure-core;1.2.0` (this should match the 'current' version of core). The dependency update tags in the pom files that required this dependency would now reference `{x-version-update;unreleased_com.azure:azure-core;dependency}`. Once the updated library has been released the unreleased dependency version should be removed and the POM file update tags should be referencing the released version.
An example of an Unreleased Dependency version: Additive, not breaking, API changes have been made to `com.azure:azure-core`. `com.azure:azure-storage-blob` has a dependency on `com.azure:azure-core` and requires the additive API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_<groupId>:<artifactId>;dependency-version`, in this example that would be `unreleased_com.azure:azure-core;1.2.0` (this should match the 'current' version of core). The dependency update tags in the pom files that required this dependency would now reference `{x-version-update;unreleased_com.azure:azure-core;dependency}`. Once the updated library has been released the unreleased dependency version should be removed and the POM file update tags should be referencing the released version.
### Tooling, version files and marker tags
@ -164,10 +164,10 @@ In README files this ends up being slightly different. Because the version tag i
### What does the process look like?
Let's say we've GA'd and I need to tick up the version of azure-storage libraries how would I do it? Guidelines for incrementing versions after release can be found [here](https://github.com/Azure/azure-sdk/blob/master/docs/policies/releases.md#incrementing-after-release).
Let's say we've GA'd and I need to tick up the version of azure-storage libraries how would I do it? Guidelines for incrementing versions after release can be found [here](https://github.com/Azure/azure-sdk/blob/main/docs/policies/releases.md#incrementing-after-release).
1. I'd open up eng\versioning\version_client.txt and update the current-versions of the libraries that are built and released as part of the azure storage pipeline. This list can be found in pom.service.xml under the sdk/storage directory. It's worth noting that any module entry starting with "../" are external module dependencies and not something that's released as part of the pipeline. Dependencies for library components outside of a given area would be downloading the appropriate dependency from Maven like we do for external dependencies.
2. Execute the update_versions python script from the root of the enlistment. The exact syntax and commands will vary based upon what is being changed and some examples can be found in the use cases in the [update_versions.py](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/update_versions.py#L6) file.
2. Execute the update_versions python script from the root of the enlistment. The exact syntax and commands will vary based upon what is being changed and some examples can be found in the use cases in the [update_versions.py](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/update_versions.py#L6) file.
3. Review and submit a PR with the modified files.
### Next steps: Management plane
@ -179,11 +179,11 @@ Let's say we've GA'd and I need to tick up the version of azure-storage librarie
This is where the `unreleased_` dependency tags come into play. Using the Unreleased Dependency example above, where `com.azure:azure-storage-blob` has a dependency on an unreleased `com.azure:azure-core`:
- [ ] Make the additive changes to `com.azure:azure-core`
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/version_client.txt) add the entry for the unreleased azure core in the unreleased section at the bottom of the file. The entry would look like `unreleased_com.azure:azure-core;<version>`.
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt) add the entry for the unreleased azure core in the unreleased section at the bottom of the file. The entry would look like `unreleased_com.azure:azure-core;<version>`.
Note: The version of the library referenced in the unreleased version tag should match the current version of that library.
- [ ] In the pom.xml file for `com.azure:azure-storage-blob`, the dependency tag for `com.azure:azure-core` which was originally `{x-version-update;com.azure:azure-core-test;dependency}` would now become `{x-version-update;unreleased_com.azure:azure-core-test;dependency}`
After the unreleased version of `com.azure:azure-core` was released but before `com.azure:azure-storage-blob` has been released.
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/master/eng/versioning/version_client.txt) the the dependency version of `com.azure:azure-core` would become the released version and the "unreleased_" entry, at this time, would be removed.
- [ ] In [version_client.txt](https://github.com/Azure/azure-sdk-for-java/blob/main/eng/versioning/version_client.txt) the the dependency version of `com.azure:azure-core` would become the released version and the "unreleased_" entry, at this time, would be removed.
- [ ] In the pom.xml file for `com.azure:azure-storage-blob`, the dependency tag for `com.azure:azure-core` would get changed back to `{x-version-update;com.azure:azure-core-test;dependency}`
### Dev Feed

Просмотреть файл

@ -15,19 +15,19 @@ For your convenience, each service has a separate set of libraries that you can
### Libraries available
Currently, the client libraries are in **beta**. These libraries follow the [Azure SDK Design Guidelines for Android](https://azure.github.io/azure-sdk/android_design.html) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features in [azure-core](https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/core/azure-core/README.md).
Currently, the client libraries are in **beta**. These libraries follow the [Azure SDK Design Guidelines for Android](https://azure.github.io/azure-sdk/android_design.html) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features in [azure-core](https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/core/azure-core/README.md).
The following libraries are currently in **beta**:
#### Core
- [azure-core](https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/core/azure-core): 1.0.0-beta.6
- [azure-core-logging](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-logging): 1.0.0-beta.6
- [azure-core-http](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-http): 1.0.0-beta.6
- [azure-core-http-okhttp](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-http-okhttp): 1.0.0-beta.6
- [azure-core-http-httpurlconnection](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-http-httpurlconnection): 1.0.0-beta.6
- [azure-core-jackson](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-jackson): 1.0.0-beta.6
- [azure-core-rest](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-rest): 1.0.0-beta.6
- [azure-core-credentials](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/core/azure-core-credential): 1.0.0-beta.6
- [azure-core](https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/core/azure-core): 1.0.0-beta.6
- [azure-core-logging](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-logging): 1.0.0-beta.6
- [azure-core-http](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-http): 1.0.0-beta.6
- [azure-core-http-okhttp](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-http-okhttp): 1.0.0-beta.6
- [azure-core-http-httpurlconnection](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-http-httpurlconnection): 1.0.0-beta.6
- [azure-core-jackson](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-jackson): 1.0.0-beta.6
- [azure-core-rest](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-rest): 1.0.0-beta.6
- [azure-core-credentials](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/core/azure-core-credential): 1.0.0-beta.6
> Note: The SDK is currently in **beta**. The API surface and feature sets are subject to change at any time before they become generally available. We do not currently recommend them for production use.
@ -35,8 +35,8 @@ The following libraries are currently **generally available**:
#### Azure Communication Services
- [azure-communication-calling](https://search.maven.org/artifact/com.azure.android/azure-communication-calling): 1.0.0
- [azure-communication-chat](https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/communication/azure-communication-chat): 1.0.0
- [azure-communication-common](https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/communication/azure-communication-common): 1.0.1
- [azure-communication-chat](https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/communication/azure-communication-chat): 1.0.0
- [azure-communication-common](https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/communication/azure-communication-common): 1.0.1
### Install the libraries
To install the Azure client libraries for Android, add them as dependencies within your
@ -83,7 +83,7 @@ To import one or more client libraries into your project using the [Maven](https
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) <secure@microsoft.com>. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://www.microsoft.com/msrc/faqs-report-an-issue).
## Contributing
For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-android/blob/master/CONTRIBUTING.md).
For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-android/blob/main/CONTRIBUTING.md).
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit
https://cla.microsoft.com.

Просмотреть файл

@ -2,6 +2,6 @@
This directory contains some documentations for this repository:
The directory structure is the following
- [design](https://github.com/Azure/azure-sdk-for-android/blob/master/doc/design) : contains design documentation for _developers_ of SDK (not _consumers_ of SDK)
- [design](https://github.com/Azure/azure-sdk-for-android/blob/main/doc/design) : contains design documentation for _developers_ of SDK (not _consumers_ of SDK)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-android%2Fdoc%2FREADME.png)

Просмотреть файл

@ -537,7 +537,7 @@
<a href="https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17" target="_blank" class="links">Azure Client SDK for Java</a>
<div class="pull-right">
<a href="https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17">
<img src="https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=master"/>
<img src="https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=main"/>
</a>
</div>
</li>

Просмотреть файл

@ -112,25 +112,25 @@
- Renamed `CommunicationError` to `ChatError`.
- Removed `CommunicationErrorResponse`.
- Renamed `CommunicationErrorResponseException` to `ChatErrorResponseException`.
- Renamed `repeatabilityRequestId` renamed to `idempotencyToken` in `CreateChatThreadOptions`.
- Renamed `repeatabilityRequestId` renamed to `idempotencyToken` in `CreateChatThreadOptions`.
- Renamed `chatThread` to `chatThreadProperties` in `CreateChatThreadResult`.
- Removed the `azure-communication-chat.properties` file.
### New Features
- Added ChatThreadClientBuilder
- Added InvalidParticipantException
- Added chat basic operations in test app
- Added chat basic operations in test app
### Bug Fixes
- Fixed real time notification connection URL.
## 1.0.0-beta.7 (2021-03-09)
### Added
- Support real time notifications with new methods in ChatClient/ChatAsyncClient:
- Support real time notifications with new methods in ChatClient/ChatAsyncClient:
- startRealtimeNotifications
- stopRealtimeNotifications
- on(chatEventId, listenerId, listener)
- off(chatEventId, listenerId)
- on(chatEventId, listenerId, listener)
- off(chatEventId, listenerId)
- Add a sample chat app under folder samples for testing and playing around chat functionality purpose.
### Breaking Changes
@ -182,11 +182,11 @@
- Support for Rich Text Chat message content
- New classes
- ChatMessageContent
- ChatMessageType
- ChatMessageType
- AddChatParticipantsErrors
- AddChatParticipantsResult
- ChatMessageType
### Breaking Changes
- ChatMessage properties are now all required
- ChatMessage type is no longer a String type but an extendable Enum type, ChatMessageType
@ -207,5 +207,5 @@ This is the initial release of Azure Communication Services for chat. For more i
This is a Public Preview version, so breaking changes are possible in subsequent releases as we improve the product. To provide feedback, please submit an issue in our [Azure SDK for Java GitHub repo](https://github.com/Azure/azure-sdk-for-android/issues).
<!-- LINKS -->
[read_me]: https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/communication/azure-communication-chat/README.md
[read_me]: https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/communication/azure-communication-chat/README.md
[documentation]: https://docs.microsoft.com/azure/communication-services/quickstarts/chat/get-started?pivots=programming-language-java

Просмотреть файл

@ -1,6 +1,6 @@
# Azure Communication Chat client library for Android
Azure Communication Chat contains the APIs used in chat applications for Azure Communication Services.
Azure Communication Chat contains the APIs used in chat applications for Azure Communication Services.
[Source code][source] | [Package (Maven)][package] | [API reference documentation][api_documentation]
| [Product documentation][product_docs]
@ -80,8 +80,8 @@ endpoint = "https://*Azure-Communication-Resource-Name*.communications.azure.com
### Request a User Access Token
User access tokens enable you to build client applications that directly authenticate to Azure Communication Services.
You generate these tokens on your server, pass them back to a client device, and then use them to initialize the Communication Services SDKs.
User access tokens enable you to build client applications that directly authenticate to Azure Communication Services.
You generate these tokens on your server, pass them back to a client device, and then use them to initialize the Communication Services SDKs.
Learn how to generate user access tokens from [User Access Tokens](https://docs.microsoft.com/azure/communication-services/quickstarts/access-tokens?pivots=programming-language-java#issue-user-access-tokens)
@ -124,7 +124,7 @@ Use the `createChatThread` method to create a chat thread.
- Use `topic` to give a thread topic;
- Use `participants` to list the thread participants to be added to the thread;
`CreateChatThreadResult` is the response returned from creating a chat thread.
`CreateChatThreadResult` is the response returned from creating a chat thread.
It contains a `getChatThread()` method which returns the `ChatThread` object that can be used to get the thread client from which you can get the `ChatThreadClient` for performing operations on the created thread: add participants, send message, etc.
The `ChatThread` object also contains the `getId()` method which retrieves the unique ID of the thread.
@ -238,11 +238,11 @@ chatMessages.forEach(chatMessage -> {
});
```
`listMessages` returns the latest version of the message, including any edits or deletes that happened to the message using `.editMessage()` and `.deleteMessage()`.
`listMessages` returns the latest version of the message, including any edits or deletes that happened to the message using `.editMessage()` and `.deleteMessage()`.
For deleted messages, `chatMessage.getDeletedOn()` returns a datetime value indicating when that message was deleted.
For deleted messages, `chatMessage.getDeletedOn()` returns a datetime value indicating when that message was deleted.
For edited messages, `chatMessage.getEditedOn()` returns a datetime indicating when the message was edited.
For edited messages, `chatMessage.getEditedOn()` returns a datetime indicating when the message was edited.
The original time of message creation can be accessed using `chatMessage.getCreatedOn()`, and it can be used for ordering the messages.
@ -393,4 +393,4 @@ Check out other client libraries for Azure communication service
[product_docs]: https://docs.microsoft.com/azure/communication-services/
[package]: https://search.maven.org/artifact/com.azure/azure-communication-chat
[api_documentation]: https://aka.ms/java-docs
[source]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/communication/azure-communication-chat/src
[source]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/communication/azure-communication-chat/src

Просмотреть файл

@ -60,5 +60,5 @@ This package contains common code for Azure Communication Service libraries. For
This is a Public Preview version, so breaking changes are possible in subsequent releases as we improve the product. To provide feedback, please submit an issue in our [Azure SDK for Java GitHub repo](https://github.com/Azure/azure-sdk-for-java/issues).
<!-- LINKS -->
[read_me]: https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/communication/azure-communication-common/README.md
[read_me]: https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/communication/azure-communication-common/README.md
[documentation]: https://docs.microsoft.com/azure/communication-services/quickstarts/chat/get-started?pivots=programming-language-java

Просмотреть файл

@ -2,7 +2,7 @@
This package contains common code for Azure Communication Service libraries.
[Source code](https://github.com/Azure/azure-sdk-for-android/tree/master/sdk/communication/azure-communication-common)
[Source code](https://github.com/Azure/azure-sdk-for-android/tree/main/sdk/communication/azure-communication-common)
| [API reference documentation](https://azure.github.io/azure-sdk-for-android/azure-communication-common/index.html)
| [Product documentation](https://docs.microsoft.com/azure/communication-services/overview)

Просмотреть файл

@ -11,7 +11,6 @@ resources:
trigger:
branches:
include:
- master
- main
- feature/*
- hotfix/*
@ -23,7 +22,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- hotfix/*

Просмотреть файл

@ -2,12 +2,12 @@
[![Build Documentation](https://img.shields.io/badge/documentation-published-blue.svg)](https://azure.github.io/azure-sdk-for-android)
Azure Core provides shared primitives, abstractions, and helpers for modern Android Azure SDK client libraries.
Azure Core provides shared primitives, abstractions, and helpers for modern Android Azure SDK client libraries.
## Sub-projects
Azure Core is split into a number of sub-components:
- [https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/core/azure-core](https://github.com/Azure/azure-sdk-for-android/blob/master/sdk/core/azure-core) is the primary library, used by all client libraries to offer the functionality outlined above.
- [https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/core/azure-core](https://github.com/Azure/azure-sdk-for-android/blob/main/sdk/core/azure-core) is the primary library, used by all client libraries to offer the functionality outlined above.
- TODO

Просмотреть файл

@ -13,7 +13,6 @@ resources:
trigger:
branches:
include:
- master
- main
- feature/*
- hotfix/*
@ -29,7 +28,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- hotfix/*