Simplify release workflow (#5144)

open-telemetry · Jan 18, 2022 · 71685c1 · 71685c1
1 parent cee51bc
commit 71685c1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 226 deletions.
diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml
diff --git a/.github/workflows/release-build.yml → .github/workflows/release.yml b/.github/workflows/release-build.yml → .github/workflows/release.yml
@@ -1,15 +1,7 @@
-# Releases a new minor / major version from a release branch
+# Releases a new major / minor / patch version from a release branch
 name: Release Build
 on:
   workflow_dispatch:
-    inputs:
-      release-branch-name:
-        description: The release branch to use, e.g. v1.9.x
-        required: true
-      version:
-        # TODO (trask) this is redundant
-        description: The version of the release, e.g. 1.9.0 (without the "v" prefix)
-        required: true
 
 jobs:
   test:
@@ -23,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
         with:
-          ref: ${{ github.event.inputs.release-branch-name }}
+          ref: ${{ github.ref_name }}
 
       - id: setup-test-java
         name: Set up JDK ${{ matrix.test-java-version }} for running tests
@@ -74,7 +66,7 @@ jobs:
 
       - uses: actions/checkout@v2.3.4
         with:
-          ref: ${{ github.event.inputs.release-branch-name }}
+          ref: ${{ github.ref_name }}
 
       - name: Set up JDK 11 for running Gradle
         uses: actions/setup-java@v2
@@ -96,7 +88,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
         with:
-          ref: ${{ github.event.inputs.release-branch-name }}
+          ref: ${{ github.ref_name }}
 
       - name: Set up JDK 11 for running Gradle
         uses: actions/setup-java@v2
@@ -142,7 +134,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
         with:
-          ref: ${{ github.event.inputs.release-branch-name }}
+          ref: ${{ github.ref_name }}
 
       - name: Set up JDK 11 for running Gradle
         uses: actions/setup-java@v2
@@ -171,15 +163,21 @@ jobs:
           arguments: build publishPlugins
           build-root-directory: gradle-plugins
 
+      - name: Set release version
+        id: set-release-version
+        run: |
+          v=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | head -1)
+          echo "::set-output name=release-version::$v"
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1.1.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v${{ github.event.inputs.version }}
-          commitish: ${{ github.event.inputs.release-branch-name }}
-          release_name: Release v${{ github.event.inputs.version }}
+          tag_name: v${{ steps.set-release-version.outputs.release-version }}
+          commitish: ${{ github.ref_name }}
+          release_name: Release v${{ steps.set-release-version.outputs.release-version }}
           draft: true
           prerelease: false
 
@@ -190,6 +188,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: javaagent/build/libs/opentelemetry-javaagent-${{ github.event.inputs.version }}.jar
+          asset_path: javaagent/build/libs/opentelemetry-javaagent-${{ steps.set-release-version.outputs.release-version }}.jar
           asset_name: opentelemetry-javaagent.jar
           asset_content_type: application/java-archive
diff --git a/RELEASING.md b/RELEASING.md
@@ -26,14 +26,10 @@ Before making the release:
     * examples/extension/build.gradle
   * Bump the version in the download link in the root `README.md` file
 
-Open the release build workflow in your browser [here](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release-build.yml).
+Open the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release.yml).
 
-You will see a button that says "Run workflow". Press the button, then enter the following:
-* Use workflow from: <select the branch from dropdown list, e.g. `v1.9.x`>
-* The release branch to use: <e.g. `v1.9.x`>
-* The version of the release: <e.g. `1.9.0`>
-
-(Yes there is redundancy between the above inputs that we plan to address.)
+Press the "Run workflow" button, then select the release branch from the dropdown list,
+e.g. `v1.9.x`, and click the "Run workflow" button below that.
 
 This triggers the release process, which builds the artifacts, publishes the artifacts, and creates
 and pushes a git tag with the version number.
@@ -73,12 +69,10 @@ Before making the release:
   * examples/distro/build.gradle
   * examples/extension/build.gradle
 
-To make a patch release, open the patch release build workflow in your browser
-[here](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/patch-release-build.yml).
+Open the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release.yml).
 
-You will see a button that says "Run workflow". Press the button, then enter the following:
-* Use workflow from: <select the branch from dropdown list, e.g. `v1.9.x`>
-* The release branch to use: <e.g. `v1.9.x`>
-* The version of the release: <e.g. `1.9.1`>
+Press the "Run workflow" button, then select the release branch from the dropdown list,
+e.g. `v1.9.x`, and click the "Run workflow" button below that.
 
-(Yes there is redundancy between the above inputs that we plan to address.)
+This triggers the release process, which builds the artifacts, publishes the artifacts, and creates
+and pushes a git tag with the version number.