ci: pin release to 1.11.2 (#12051)

grafana · Feb 23, 2024 · d198b22 · d198b22
1 parent 78f7684
commit d198b22
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 36 deletions.
diff --git a/.github/jsonnetfile.json b/.github/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "v1.11.0"
+      "version": "v1.11.2"
     }
   ],
   "legacyImports": true

diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "2fdeeb8b15cd8feab4e2c06a0af735df772d31ad",
-      "sum": "VbCmY3Z2t3EA7whoQXaS5Gn2F0p9+dHJlgH/d6d2jf0="
+      "version": "b59ef022d139609ea1053eb909fc942abad09279",
+      "sum": "JjoSVKiDoi5YfbFvueo9UXzEB/889MA+c8sSo3HtztQ="
     }
   ],
   "legacyImports": false

diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
@@ -1,8 +1,8 @@
 local lokiRelease = import 'workflows/main.jsonnet';
 local build = lokiRelease.build;
 
-local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@v1.11.0';
-local releaseLibRef = 'v1.11.0';
+local releaseLibRef = 'v1.11.2';
+local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
 {
   'patch-release-pr.yml': std.manifestYamlDoc(
     lokiRelease.releasePRWorkflow(

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/vendor/github.com/grafana/loki-release/workflows/release.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -3,17 +3,17 @@ concurrency:
 env:
   DOCKER_USERNAME: "grafana"
   IMAGE_PREFIX: "grafana"
-  RELEASE_LIB_REF: "v1.11.0"
+  RELEASE_LIB_REF: "v1.11.2"
   RELEASE_REPO: "grafana/loki"
   SKIP_VALIDATION: false
   VERSIONING_STRATEGY: "always-bump-minor"
 jobs:
   check:
-    uses: "grafana/loki-release/.github/workflows/[email protected].0"
+    uses: "grafana/loki-release/.github/workflows/[email protected].2"
     with:
       build_image: "grafana/loki-build-image:0.29.3-go1.20.10"
       golang_ci_lint_version: "v1.51.2"
-      release_lib_ref: "v1.11.0"
+      release_lib_ref: "v1.11.2"
       skip_validation: false
   create-release-pr:
     needs:
@@ -57,16 +57,18 @@ jobs:
         npm install
         npm exec -- release-please release-pr \
           --consider-all-branches \
-          --label "backport main,autorelease: pending,type/docs" \
-          --pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
           --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+          --label "backport main,autorelease: pending,product-approved" \
+          --manifest-file .release-please-manifest.json \
+          --pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
+          --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 "${{ secrets.GH_TOKEN }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
-          --separate-pull-requests false \
-          --manifest-file .release-please-manifest.json
+          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        
       working-directory: "lib"
   dist:
     needs:
@@ -698,13 +700,14 @@ jobs:
           --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="${{ secrets.GH_TOKEN }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
-          --manifest-file .release-please-manifest.json
+          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
         
         cat release.json
         

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -3,17 +3,17 @@ concurrency:
 env:
   DOCKER_USERNAME: "grafana"
   IMAGE_PREFIX: "grafana"
-  RELEASE_LIB_REF: "v1.11.0"
+  RELEASE_LIB_REF: "v1.11.2"
   RELEASE_REPO: "grafana/loki"
   SKIP_VALIDATION: false
   VERSIONING_STRATEGY: "always-bump-patch"
 jobs:
   check:
-    uses: "grafana/loki-release/.github/workflows/[email protected].0"
+    uses: "grafana/loki-release/.github/workflows/[email protected].2"
     with:
       build_image: "grafana/loki-build-image:0.29.3-go1.20.10"
       golang_ci_lint_version: "v1.51.2"
-      release_lib_ref: "v1.11.0"
+      release_lib_ref: "v1.11.2"
       skip_validation: false
   create-release-pr:
     needs:
@@ -57,16 +57,18 @@ jobs:
         npm install
         npm exec -- release-please release-pr \
           --consider-all-branches \
-          --label "backport main,autorelease: pending,type/docs" \
-          --pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
           --group-pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
+          --label "backport main,autorelease: pending,product-approved" \
+          --manifest-file .release-please-manifest.json \
+          --pull-request-footer "Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" \
+          --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 "${{ secrets.GH_TOKEN }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
-          --separate-pull-requests false \
-          --manifest-file .release-please-manifest.json
+          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
+        
       working-directory: "lib"
   dist:
     needs:
@@ -698,13 +700,14 @@ jobs:
           --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="${{ secrets.GH_TOKEN }}" \
-          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \
-          --manifest-file .release-please-manifest.json
+          --versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
         
         cat release.json
         

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,14 +2,15 @@ concurrency:
   group: "create-release-${{ github.sha }}"
 env:
   IMAGE_PREFIX: "grafana"
-  RELEASE_LIB_REF: "v1.11.0"
+  RELEASE_LIB_REF: "v1.11.2"
   RELEASE_REPO: "grafana/loki"
 jobs:
   createRelease:
     if: "${{ fromJSON(needs.shouldRelease.outputs.shouldRelease) }}"
     needs:
     - "shouldRelease"
     outputs:
+      name: "${{ needs.shouldRelease.outputs.name }}"
       sha: "${{ needs.shouldRelease.outputs.sha }}"
     runs-on: "ubuntu-latest"
     steps:
@@ -58,7 +59,6 @@ jobs:
       name: "upload artifacts"
       run: |
         gh release upload ${{ needs.shouldRelease.outputs.name }} dist/*
-        gh release edit ${{ needs.shouldRelease.outputs.name }} --draft=false
       working-directory: "release"
   publishImages:
     needs:
@@ -94,6 +94,23 @@ jobs:
       with:
         imageDir: "images"
         imagePrefix: "${{ env.IMAGE_PREFIX }}"
+  publishRelease:
+    needs:
+    - "createRelease"
+    - "publishImages"
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: "pull code to release"
+      uses: "actions/checkout@v4"
+      with:
+        path: "release"
+        repository: "${{ env.RELEASE_REPO }}"
+    - env:
+        GH_TOKEN: "${{ secrets.GH_TOKEN }}"
+      name: "publish release"
+      run: |
+        gh release edit ${{ needs.createRelease.outputs.name }} --draft=false
+      working-directory: "release"
   shouldRelease:
     outputs:
       branch: "${{ steps.extract_branch.outputs.branch }}"

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.8.9"
+  ".": "2.8.8"
 }