microsoftgraph · baywet · Apr 18, 2024 · Apr 17, 2024 · Apr 17, 2024 · Apr 17, 2024
diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml
@@ -22,14 +22,12 @@ jobs:
           event: push
           name: drop
           path: drop
-      - name: Github Release
-        uses: anton-yurchenko/git-release@v6.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DRAFT_RELEASE: "false"
-          PRE_RELEASE: "false"
-          CHANGELOG_FILE: "CHANGELOG.md"
-          ALLOW_EMPTY_CHANGELOG: "true"
+      # This action works with an existing release (created by the release bot) and uploads the build artifacts
+      - name: GitHub Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          args: |
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fail_on_unmatched_files: true
+          files: |
             drop/build/**/*.jar
diff --git a/.github/workflows/preview-and-release.yml b/.github/workflows/preview-and-release.yml
@@ -94,27 +94,3 @@ jobs:
             gradle.properties
             **/gradle/**
             Scripts/**
-
-  create_Tag:
-    needs: maven_Release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    env:
-      RELEASE_TAG: ""
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get Version
-        id: GetVersion
-        run: .\Scripts\getLatestVersion.ps1
-        shell: pwsh
-      - name: Create tag
-        uses: rickstaa/action-create-tag@v1.7.2
-        with:
-          tag: ${{ steps.GetVersion.outputs.tag }}
-      - name: Queue Git Release
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Git Release
-          token: ${{ secrets.PERSONAL_TOKEN }}
-          ref: ${{ steps.GetVersion.outputs.tag }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -0,0 +1,21 @@
+on:
+  push:
+    branches:
+      - dev
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: release-bot
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v4
+        with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+          config-file: release-please-config.json # Set to update gradle.properties, pom.xml & CHANGELOG.md
+          manifest-file: .release-please-manifest.json
+          target-branch: dev
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+    ".": "6.6.0"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-### Added
-
-### Changed
-
 ## [6.6.0] - 2024-04-16
 
 ### Added

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -25,6 +25,37 @@ Revisions of this nature will result in a 0.X.X change of the version number.
 
 All the code of the current repository is being generated automatically by the [SDK generator](https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator/) in which any change must be reflected.
 
+## Commit message format
+
+To support our automated release process, pull requests are required to follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
+format.
+
+Each commit message consists of a **header**, an optional **body** and an optional **footer**. The header is the first line of the commit and
+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.
+
+```
+<type>[optional scope]: <short description>
+<BLANK LINE>
+<optional body>
+<BLANK LINE>
+<optional footer(s)>
+```
+
+The recommended commit types used are:
+
+ - **feat** for feature updates (increments the _minor_ version)
+ - **fix** for bug fixes (increments the _patch_ version)
+ - **perf** for performance related changes e.g. optimizing an algorithm
+ - **refactor** for code refactoring changes
+ - **test** for test suite updates e.g. adding a test or fixing a test
+ - **style** for changes that don't affect the meaning of code. e.g. formatting changes
+ - **docs** for documentation updates e.g. ReadMe update or code documentation updates
+ - **build** for build system changes (gradle updates, external dependency updates)
+ - **ci** for CI configuration file changes e.g. updating a pipeline
+ - **chore** for miscallaneous non-sdk changesin the repo e.g. removing an unused file
+
+Adding a footer with the prefix **BREAKING CHANGE:** will cause an increment of the _major_ version.
+
 ## Add yourself as a contributor
 
 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:

diff --git a/README.md b/README.md
@@ -20,7 +20,9 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
+    // x-release-please-start-version
     implementation 'com.microsoft.graph:microsoft-graph:6.6.0'
+    // x-release-please-end
     // This dependency is only needed if you are using a TokenCredential object for authentication
     implementation 'com.azure:azure-identity:1.11.0'
 }
@@ -35,7 +37,9 @@ Add the dependency in `dependencies` in pom.xml
   <!-- Include the sdk as a dependency -->
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
+  <!--x-release-please-start-version-->
   <version>6.6.0</version>
+  <!--x-release-please-end-->
 </dependency>
 <dependency>
   <!-- This dependency is only needed if you are using a TokenCredential object for authentication -->

diff --git a/Scripts/incrementMinorVersion.ps1 b/Scripts/incrementMinorVersion.ps1
diff --git a/gradle.properties b/gradle.properties
@@ -25,9 +25,15 @@ org.gradle.caching=true
 
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
+# x-release-please-start-major
 mavenMajorVersion = 6
+# x-release-please-end
+# x-release-please-start-minor
 mavenMinorVersion = 6
+# x-release-please-end
+# x-release-please-start-patch
 mavenPatchVersion = 0
+# x-release-please-end
 mavenArtifactSuffix =
 
 #These values are used to run functional tests

diff --git a/release-please-config.json b/release-please-config.json
@@ -0,0 +1,38 @@
+{
+  "bootstrap-sha": "6342ecd17b3c26f5d27b33ff49a2ceedc206f140",
+  "exclude-paths": [
+    ".git",
+    ".idea",
+    ".github",
+    ".vscode"
+  ],
+  "release-type": "java",
+  "include-component-in-tag": false,
+  "include-v-in-tag": true,
+  "packages": {
+    ".": {
+      "package-name": "com.microsoft.graph.microsoft-graph",
+      "changelog-path": "CHANGELOG.md",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "gradle.properties"
+        },
+        {
+          "type": "generic",
+          "path": "README.md"
+        },
+        {
+          "type": "generic",
+          "path": "src/main/java/com/microsoft/graph/info/Constants.java"
+        },
+        {
+          "type": "xml",
+          "path": "pom.xml",
+          "xpath": "//project/version"
+        }
+      ]
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}
diff --git a/src/main/java/com/microsoft/graph/info/Constants.java b/src/main/java/com/microsoft/graph/info/Constants.java
@@ -3,6 +3,8 @@
 /** Multi-purpose constants holder used accross the SDK */
 public final class Constants {
     /** The SDK version */
+    // x-release-please-start-version
     public static final String VERSION_NAME = "6.6.0";
+    // x-release-please-end
 }