ci: bump release code to allow for RELEASE_AS

grafana · Mar 27, 2024 · 929cd0f · 929cd0f
1 parent 5589e67
commit 929cd0f
Show file tree

Hide file tree

Showing 8 changed files with 966 additions and 65 deletions.
diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "f1f89ced80154ade3b28f9ad9bd4541cdc79aae1",
-      "sum": "TQ2X5sm7o+BCrytzSbJ7Th2YqNZ2ZPx9Wg62x5mEVJ0="
+      "version": "c621c69d3b797329ced80672c834784d9a465864",
+      "sum": "et6CvaD2F57Y9+tK9XHqepGJoNerE6uOuCLvvYpger4="
     }
   ],
   "legacyImports": false

diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
@@ -65,7 +65,7 @@ local imagePrefix = 'grafana';
       name: 'Prepare Minor Release PR from Weekly',
     }, false, false
   ),
-  'major-release-pr.yml': std.manifestYamlDoc(
+  'three-zero-release.yml': std.manifestYamlDoc(
     lokiRelease.releasePRWorkflow(
       branches=['main', 'add-major-release-workflow'],
       buildImage=buildImage,
@@ -76,12 +76,12 @@ local imagePrefix = 'grafana';
       imagePrefix=imagePrefix,
       releaseLibRef=releaseLibRef,
       releaseRepo='grafana/loki',
-      skipArm=true,
-      skipValidation=true,
+      skipArm=false,
+      skipValidation=false,
       useGitHubAppToken=true,
-      versioningStrategy='default',
+      releaseAs='3.0.0-rc.1',
     ) + {
-      name: 'Prepare Major Release PR from main',
+      name: 'Prepare Loki 3.0 release',
     }, false, false
   ),
   'release.yml': std.manifestYamlDoc(

diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -768,19 +768,36 @@ jobs:
       name: "get release version"
       run: |
         npm install
-        npm exec -- release-please release-pr \
-          --consider-all-branches \
-          --dry-run \
-          --dry-run-output release.json \
-          --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --manifest-file .release-please-manifest.json \
-          --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --release-type simple \
-          --repo-url "${{ env.RELEASE_REPO }}" \
-          --separate-pull-requests false \
-          --target-branch "${{ steps.extract_branch.outputs.branch }}" \
-          --token "${{ steps.github_app_token.outputs.token }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        
+        if [[ -z "${{ env.RELEASE_AS }}" ]]; then
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        else
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --release-as "${{ env.RELEASE_AS }}"
+        fi
         
         cat release.json
         

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -768,19 +768,36 @@ jobs:
       name: "get release version"
       run: |
         npm install
-        npm exec -- release-please release-pr \
-          --consider-all-branches \
-          --dry-run \
-          --dry-run-output release.json \
-          --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --manifest-file .release-please-manifest.json \
-          --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --release-type simple \
-          --repo-url "${{ env.RELEASE_REPO }}" \
-          --separate-pull-requests false \
-          --target-branch "${{ steps.extract_branch.outputs.branch }}" \
-          --token "${{ steps.github_app_token.outputs.token }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        
+        if [[ -z "${{ env.RELEASE_AS }}" ]]; then
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        else
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --release-as "${{ env.RELEASE_AS }}"
+        fi
         
         cat release.json
         

diff --git a/.github/workflows/major-release-pr.yml → .github/workflows/three-0-release.yml b/.github/workflows/major-release-pr.yml → .github/workflows/three-0-release.yml
@@ -7,19 +7,20 @@ env:
   DOCKER_USERNAME: "grafana"
   DRY_RUN: false
   IMAGE_PREFIX: "grafana"
+  RELEASE_AS: "3.0.0-rc.1"
   RELEASE_LIB_REF: "main"
   RELEASE_REPO: "grafana/loki"
-  SKIP_VALIDATION: true
+  SKIP_VALIDATION: false
   USE_GITHUB_APP_TOKEN: true
-  VERSIONING_STRATEGY: "default"
+  VERSIONING_STRATEGY: "always-bump-patch"
 jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
       build_image: "grafana/loki-build-image:0.33.0"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
-      skip_validation: true
+      skip_validation: false
       use_github_app_token: true
   create-release-pr:
     needs:
@@ -124,7 +125,7 @@ jobs:
         DRONE_TAG: "${{ needs.version.outputs.version }}"
         IMAGE_TAG: "${{ needs.version.outputs.version }}"
         NFPM_SIGNING_KEY_FILE: "nfpm-private-key.key"
-        SKIP_ARM: true
+        SKIP_ARM: false
       if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "build artifacts"
       run: |
@@ -768,19 +769,36 @@ jobs:
       name: "get release version"
       run: |
         npm install
-        npm exec -- release-please release-pr \
-          --consider-all-branches \
-          --dry-run \
-          --dry-run-output release.json \
-          --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --manifest-file .release-please-manifest.json \
-          --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
-          --release-type simple \
-          --repo-url "${{ env.RELEASE_REPO }}" \
-          --separate-pull-requests false \
-          --target-branch "${{ steps.extract_branch.outputs.branch }}" \
-          --token "${{ steps.github_app_token.outputs.token }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        
+        if [[ -z "${{ env.RELEASE_AS }}" ]]; then
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        else
+          npm exec -- release-please release-pr \
+            --consider-all-branches \
+            --dry-run \
+            --dry-run-output release.json \
+            --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --manifest-file .release-please-manifest.json \
+            --pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+            --release-type simple \
+            --repo-url "${{ env.RELEASE_REPO }}" \
+            --separate-pull-requests false \
+            --target-branch "${{ steps.extract_branch.outputs.branch }}" \
+            --token "${{ steps.github_app_token.outputs.token }}" \
+            --release-as "${{ env.RELEASE_AS }}"
+        fi
         
         cat release.json
         
@@ -799,7 +817,7 @@ jobs:
           echo "pr_created=true" >> $GITHUB_OUTPUT
         fi
       working-directory: "lib"
-name: "Prepare Major Release PR from main"
+name: "Prepare Loki 3.0 release"
 "on":
   push:
     branches: