feat: expose custom release as

grafana · Mar 27, 2024 · 3969562 · 3969562
1 parent f1f89ce
commit 3969562
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 40 deletions.
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -256,19 +256,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/test-release-pr.yml b/.github/workflows/test-release-pr.yml
@@ -256,19 +256,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/workflows/build.libsonnet b/workflows/build.libsonnet
@@ -119,19 +119,36 @@ local releaseLibStep = common.releaseLibStep;
       + step.withId('version')
       + step.withRun(|||
         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/workflows/main.jsonnet b/workflows/main.jsonnet
@@ -19,6 +19,7 @@
     imageBuildTimeoutMin=25,
     imageJobs={},
     imagePrefix='grafana',
+    releaseAs=null,
     releaseLibRef='main',
     releaseRepo='grafana/loki-release',
     skipArm=false,
@@ -53,7 +54,9 @@
       SKIP_VALIDATION: skipValidation,
       USE_GITHUB_APP_TOKEN: useGitHubAppToken,
       VERSIONING_STRATEGY: versioningStrategy,
-    },
+    } + if releaseAs != null then {
+      RELEASE_AS: releaseAs,
+    } else {},
     local validationSteps = ['check'],
     jobs: {
       check: {} + $.job.withUses(checkTemplate)