Skip to content

Commit 521e669

Browse files
authored
Merge pull request #1615 from microsoftgraph/feat/release-please
Feat/release please
2 parents 2359b8d + 6a91cbb commit 521e669

File tree

12 files changed

+93
-102
lines changed

12 files changed

+93
-102
lines changed

.github/release-please.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
manifest: true
2+
primaryBranch: main
3+
handleGHRelease: true

.github/workflows/build-and-publish.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -93,28 +93,3 @@ jobs:
9393
**/gradle/**
9494
Scripts/**
9595
96-
create_Tag:
97-
needs: maven_Release
98-
runs-on: ubuntu-latest
99-
permissions:
100-
contents: write
101-
env:
102-
RELEASE_TAG: ""
103-
steps:
104-
- uses: actions/checkout@v4
105-
- name: Get Version
106-
id: GetVersion
107-
run: .\scripts\getLatestVersion.ps1
108-
shell: pwsh
109-
- name: Create tag
110-
uses: rickstaa/[email protected]
111-
with:
112-
tag: ${{ steps.GetVersion.outputs.tag }}
113-
- name: Queue Git Release
114-
uses: benc-uk/workflow-dispatch@v1
115-
with:
116-
workflow: Git Release
117-
token: ${{ secrets.PERSONAL_TOKEN }}
118-
ref: ${{ steps.GetVersion.outputs.tag }}
119-
120-

.github/workflows/git-release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ jobs:
2323
name: drop
2424
path: drop
2525
- name: Github Release
26-
uses: anton-yurchenko/[email protected]
27-
env:
28-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
29-
DRAFT_RELEASE: "false"
30-
PRE_RELEASE: "false"
31-
CHANGELOG_FILE: "CHANGELOG.md"
32-
ALLOW_EMPTY_CHANGELOG: "true"
26+
uses: softprops/action-gh-release@v2
27+
if: startsWith(github.ref, 'refs/tags/')
3328
with:
34-
args: |
29+
token: ${{ secrets.GITHUB_TOKEN }}
30+
fail_on_unmatched_files: true
31+
files: |
3532
drop/build/**/*.jar

.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "3.1.10"
3+
}

CHANGELOG.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
9-
10-
### Added
11-
12-
### Changed
13-
148
## [3.1.10] - 2024-05-09
159

1610
### Changed

CONTRIBUTING.md

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,37 @@ If major functionality is being added, or there will need to be gestation time f
2020

2121
Revisions of this nature will result in a 0.X.X change of the version number.
2222

23+
## Commit message format
24+
25+
To support our automated release process, pull requests are required to follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
26+
format.
27+
28+
Each commit message consists of a **header**, an optional **body** and an optional **footer**. The header is the first line of the commit and
29+
MUST have a **type** (see below for a list of types) and a **description**. An optional **scope** can be added to the header to give extra context.
30+
31+
```
32+
<type>[optional scope]: <short description>
33+
<BLANK LINE>
34+
<optional body>
35+
<BLANK LINE>
36+
<optional footer(s)>
37+
```
38+
39+
The recommended commit types used are:
40+
41+
- **feat** for feature updates (increments the _minor_ version)
42+
- **fix** for bug fixes (increments the _patch_ version)
43+
- **perf** for performance related changes e.g. optimizing an algorithm
44+
- **refactor** for code refactoring changes
45+
- **test** for test suite updates e.g. adding a test or fixing a test
46+
- **style** for changes that don't affect the meaning of code. e.g. formatting changes
47+
- **docs** for documentation updates e.g. ReadMe update or code documentation updates
48+
- **build** for build system changes (gradle updates, external dependency updates)
49+
- **ci** for CI configuration file changes e.g. updating a pipeline
50+
- **chore** for miscallaneous non-sdk changesin the repo e.g. removing an unused file
51+
52+
Adding a footer with the prefix **BREAKING CHANGE:** will cause an increment of the _major_ version.
53+
2354
## Add yourself as a contributor
2455

2556
This project follows the [all contributors](https://github.com/kentcdodds/all-contributors) specification. When making a contribution, please add yourself to the table of contributors:
@@ -34,8 +65,8 @@ This project follows the [all contributors](https://github.com/kentcdodds/all-co
3465
You can get your GitHub UID by inspecting your GitHub avatar image.
3566

3667
2. For each contribution type (see [emoji key](https://github.com/kentcdodds/all-contributors#emoji-key) for a list of contribution types), add an emoji and a relevant link and alt-text.
37-
68+
3869
For example, if you write a blogpost on how to use the SDK, you would include:
39-
70+
4071
```html
41-
[??]("https://myblog.com/using-the-java-sdk" "Blog Post")
72+
[??]("https://myblog.com/using-the-java-sdk" "Blog Post")

readme.md renamed to README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ repositories {
2222
2323
dependencies {
2424
// Include the sdk as a dependency
25+
// x-release-please-start-version
2526
implementation 'com.microsoft.graph:microsoft-graph-core:3.1.10'
27+
// x-release-please-end
2628
// This dependency is only needed if you are using the TokenCredentialAuthProvider
2729
implementation 'com.azure:azure-identity:1.11.0'
2830
}
@@ -37,7 +39,9 @@ Add the dependency in `dependencies` in pom.xml
3739
<!-- Include the sdk as a dependency -->
3840
<groupId>com.microsoft.graph</groupId>
3941
<artifactId>microsoft-graph-core</artifactId>
42+
<!--x-release-please-start-version-->
4043
<version>3.1.10</version>
44+
<!--x-release-please-end-->
4145
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
4246
<groupId>com.azure</groupId>
4347
<artifactId>azure-identity</artifactId>

gradle.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ org.gradle.jvmargs=-Xmx2g
2323

2424
mavenGroupId = com.microsoft.graph
2525
mavenArtifactId = microsoft-graph-core
26+
# x-release-please-start-major
2627
mavenMajorVersion = 3
28+
# x-release-please-end
29+
# x-release-please-start-minor
2730
mavenMinorVersion = 1
31+
# x-release-please-end
32+
# x-release-please-start-patch
2833
mavenPatchVersion = 10
34+
# x-release-please-end
2935
mavenArtifactSuffix =
3036

3137
#These values are used to run functional tests

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
<groupId>com.microsoft.graph</groupId>
1010
<artifactId>microsoft-graph-core</artifactId>
11-
<version>3.1.0</version>
11+
<!--x-release-please-start-version-->
12+
<version>3.1.10</version>
13+
<!--x-release-please-end-->
1214
<packaging>pom</packaging>
1315

1416
<properties>

release-please-config.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"bootstrap-sha": "2d57400ce14711ffae06de400a6e10e3817632b8",
3+
"exclude-paths": [
4+
".git",
5+
".idea",
6+
".github",
7+
".vscode"
8+
],
9+
"release-type": "simple",
10+
"include-component-in-tag": false,
11+
"include-v-in-tag": true,
12+
"packages": {
13+
".": {
14+
"package-name": "com.microsoft.graph.microsoft-graph-core",
15+
"changelog-path": "CHANGELOG.md",
16+
"extra-files": [
17+
"gradle.properties",
18+
"README.md",
19+
"src/main/java/com/microsoft/graph/core/CoreConstants.java",
20+
{
21+
"type": "xml",
22+
"path": "pom.xml",
23+
"xpath": "//project/version"
24+
}
25+
]
26+
}
27+
},
28+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
29+
}

0 commit comments

Comments
 (0)