Sync'ing workflow changes/fixes (#298)

* Sync

* Fix prepare release workflow

* Better links

* more

* format

* format

Author: trask

.github/workflows/codeql-daily.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v1
 
-  issue:
+  open-issue-on-failure:
     needs: analyze
     if: failure()
     uses: ./.github/workflows/reusable-create-issue-for-failure.yml

.github/workflows/merge-change-log-to-main.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
   create-pull-request:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/prepare-patch-release.yml

@@ -10,7 +10,7 @@ jobs:
 
       - name: Set environment variables
         run: |
-          prior_version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | head -1)
+          prior_version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts)
           if [[ $prior_version =~ ([0-9]+.[0-9]+).([0-9]+) ]]; then
             major_minor="${BASH_REMATCH[1]}"
             patch="${BASH_REMATCH[2]}"
@@ -19,11 +19,10 @@ jobs:
             exit 1
           fi
           echo "VERSION=$major_minor.$((patch + 1))" >> $GITHUB_ENV
-          echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV
 
-      - name: Bump version
+      - name: Update version
         run: |
-          sed -ri "s/$PRIOR_VERSION/$VERSION/" version.gradle.kts
+          sed -ri "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/" version.gradle.kts
 
       - name: Set git user
         run: |

.github/workflows/prepare-release-branch.yml

@@ -11,15 +11,15 @@ jobs:
       - name: Create release branch
         id: create-release-branch
         run: |
-          version=$(grep -Eo "[0-9]+.[0-9]+.0-SNAPSHOT" version.gradle.kts | sed 's/-SNAPSHOT//')
+          version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
           release_branch_name=$(echo $version | sed -E 's,([0-9]+)\.([0-9]+)\.0,release/v\1.\2.x,')
 
           git push origin HEAD:$release_branch_name
 
           echo "VERSION=$version" >> $GITHUB_ENV
           echo "RELEASE_BRANCH_NAME=$release_branch_name" >> $GITHUB_ENV
 
-      - name: Drop snapshot from version
+      - name: Update version
         run: |
           sed -ri "s/val snapshot = true/val snapshot = false/" version.gradle.kts
 
@@ -45,9 +45,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Bump snapshot version
+      - name: Update version
         run: |
-          version=$(grep -Eo "[0-9]+.[0-9]+.0-SNAPSHOT" version.gradle.kts | sed 's/-SNAPSHOT//')
+          version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
           if [[ $version =~ ([0-9]+).([0-9]+).0 ]]; then
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
@@ -56,7 +56,7 @@ jobs:
             exit 1
           fi
           next_version="$major.$((minor + 1)).0"
-          sed -ri "s/$version-SNAPSHOT/$next_version-SNAPSHOT/" version.gradle.kts
+          sed -ri "s/[0-9]+\.[0-9]+\.[0-9]+/$next_version/" version.gradle.kts
 
       - name: Set git user
         run: |
@@ -67,10 +67,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          msg="Bump version"
+          msg="Update version"
           git commit -a -m "$msg"
-          git push origin HEAD:bump-snapshot-version
+          git push origin HEAD:update-version-on-main
           gh pr create --title "$msg" \
                        --body "$msg" \
-                       --head bump-snapshot-version \
+                       --head update-version-on-main \
                        --base main

.github/workflows/release.yml

@@ -78,7 +78,7 @@ jobs:
 
       - name: Set environment variables
         run: |
-          version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | head -1)
+          version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts)
           if [[ $version =~ ([0-9]+).([0-9]+).([0-9]+) ]]; then
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
@@ -90,13 +90,13 @@ jobs:
           if [[ $patch == 0 ]]; then
             if [[ $minor == 0 ]]; then
               prior_major=$((major - 1))
-              prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md  | head -1)
+              prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md | head -1)
               prior_version="$prior_major.$prior_minor"
             else
               prior_version="$major.$((minor - 1)).0"
             fi
           else
-              prior_version="$major.$minor.$((patch - 1))"
+            prior_version="$major.$minor.$((patch - 1))"
           fi
           echo "VERSION=$version" >> $GITHUB_ENV
           echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV

RELEASING.md

@@ -15,10 +15,10 @@ as the last step, which publishes a snapshot build to
 * Close the release milestone if there is one.
 * Merge a pull request to `main` updating the `CHANGELOG.md`.
   * The heading for the release should include the release version but not the release date, e.g.
-  `## Version 1.9.0 (unreleased)`.
+    `## Version 1.9.0 (unreleased)`.
   * Use `.github/scripts/draft-change-log-entries.sh` as a starting point for writing the change
     log.
-* Run the [Prepare release branch workflow](.github/workflows/prepare-release-branch.yml).
+* Run the [Prepare release branch workflow](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/prepare-release-branch.yml).
 * Review and merge the two pull requests that it creates
   (one is targeted to the release branch and one is targeted to the `main` branch).
 
@@ -29,22 +29,22 @@ All patch releases should include only bug-fixes, and must avoid adding/modifyin
 In general, patch releases are only made for regressions, memory leaks and deadlocks.
 
 * Backport pull request(s) to the release branch.
-  * Run the [Backport workflow](.github/workflows/backport.yml).
+  * Run the [Backport workflow](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/backport.yml).
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, then enter the pull request number that you want to backport,
     then click the "Run workflow" button below that.
   * Review and merge the backport pull request that it generates.
 * Merge a pull request to the release branch updating the `CHANGELOG.md`.
   * The heading for the release should include the release version but not the release date, e.g.
-  `## Version 1.9.0 (unreleased)`.
-* Run the [Prepare patch release workflow](.github/workflows/prepare-patch-release.yml).
+    `## Version 1.9.0 (unreleased)`.
+* Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/prepare-patch-release.yml).
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
 * Review and merge the pull request that it creates.
 
 ## Making the release
 
-Run the [Release workflow](.github/workflows/release.yml).
+Run the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/release.yml).
 
 * Press the "Run workflow" button, then select the release branch from the dropdown list,
   e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
@@ -55,7 +55,7 @@ Run the [Release workflow](.github/workflows/release.yml).
 
 ## After the release
 
-Run the [Merge change log to main workflow](.github/workflows/merge-change-log-to-main.yml).
+Run the [Merge change log to main workflow](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/merge-change-log-to-main.yml).
 
 * Press the "Run workflow" button, then select the release branch from the dropdown list,
   e.g. `release/v1.9.x`, and click the "Run workflow" button below that.