From 0fd797d52520ca5829346b3bb75cc019eedec7ba Mon Sep 17 00:00:00 2001
From: Trevor Whitney <trevorjwhitney@gmail.com>
Date: Tue, 20 Feb 2024 13:52:40 -0700
Subject: [PATCH] chore: remove temporary branch override

---
 .github/jsonnetfile.lock.json                 |  4 +--
 .github/release-workflows.jsonnet             |  5 ++--
 .../loki-release/workflows/build.libsonnet    |  2 +-
 .github/workflows/minor-release-pr.yml        | 22 ++++++++--------
 .github/workflows/patch-release-pr.yml        | 25 +++++++++----------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
index 3d8569760f69f..ee1f7b9596b4b 100644
--- a/.github/jsonnetfile.lock.json
+++ b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "40ee4940603c906ce4af96c898dd4a5cd0fca2d5",
-      "sum": "jvOGy42cFuFi3CxcdXyOm8Xju2pjRPuevtarfNJFqpc="
+      "version": "c005223f58b83f288b655dde5bcfeff7490c7aa5",
+      "sum": "5K+r6Bsb8JMR1ytQjSObjvHFpH7SJBi5D4ysSwvC4/g="
     }
   ],
   "legacyImports": false
diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
index 3e0b02f65b0c8..ae1f868fa651e 100644
--- a/.github/release-workflows.jsonnet
+++ b/.github/release-workflows.jsonnet
@@ -15,12 +15,12 @@ local build = lokiRelease.build;
         promtail: build.image('promtail', 'clients/cmd/promtail'),
         querytee: build.image('querytee', 'cmd/querytee', platform=['linux/amd64']),
       },
-      branches=['release-[0-9]+.[0-9]+.x', 'fix-action-names-in-main'],
+      branches=['release-[0-9]+.[0-9]+.x'],
       checkTemplate='grafana/loki-release/.github/workflows/check.yml@release-1.10.x',
       imagePrefix='grafana',
       releaseRepo='grafana/loki',
       skipArm=false,
-      skipValidation=true,
+      skipValidation=false,
       versioningStrategy='always-bump-patch',
     ), false, false
   ),
@@ -42,6 +42,7 @@ local build = lokiRelease.build;
       checkTemplate='grafana/loki-release/.github/workflows/check.yml@release-1.10.x',
       imagePrefix='grafana',
       releaseRepo='grafana/loki',
+      skipArm=false,
       skipValidation=false,
       versioningStrategy='always-bump-minor',
     ), false, false
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
index e5d06977e0bf3..cdd6b82463e4b 100644
--- a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
+++ b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
@@ -42,7 +42,7 @@ local releaseLibStep = common.releaseLibStep;
       |||),
 
       step.new('Build and export', 'docker/build-push-action@v5')
-      + step.withTimeoutMinutes(20)
+      + step.withTimeoutMinutes(25)
       + step.withIf('${{ fromJSON(needs.version.outputs.pr_created) }}')
       + step.with({
         context: context,
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
index bf360af09220f..2b700fbbc6bba 100644
--- a/.github/workflows/minor-release-pr.yml
+++ b/.github/workflows/minor-release-pr.yml
@@ -90,7 +90,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
       name: "build artifacts"
       run: |
         cat <<EOF | docker run \
@@ -154,7 +154,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -212,7 +212,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -270,7 +270,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -330,7 +330,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -388,7 +388,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -448,7 +448,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -508,7 +508,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -568,7 +568,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release/operator"
@@ -626,7 +626,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -686,7 +686,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
index 3866679f66564..411fff87d4105 100644
--- a/.github/workflows/patch-release-pr.yml
+++ b/.github/workflows/patch-release-pr.yml
@@ -4,13 +4,13 @@ env:
   DOCKER_USERNAME: "grafana"
   IMAGE_PREFIX: "grafana"
   RELEASE_REPO: "grafana/loki"
-  SKIP_VALIDATION: true
+  SKIP_VALIDATION: false
   VERSIONING_STRATEGY: "always-bump-patch"
 jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@release-1.10.x"
     with:
-      skip_validation: true
+      skip_validation: false
   create-release-pr:
     needs:
     - "dist"
@@ -154,7 +154,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -212,7 +212,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -270,7 +270,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -330,7 +330,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -388,7 +388,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -448,7 +448,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -508,7 +508,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -568,7 +568,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release/operator"
@@ -626,7 +626,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -686,7 +686,7 @@ jobs:
       working-directory: "release"
     - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
       name: "Build and export"
-      timeout-minutes: 20
+      timeout-minutes: 25
       uses: "docker/build-push-action@v5"
       with:
         context: "release"
@@ -767,7 +767,6 @@ name: "create release PR"
   push:
     branches:
     - "release-[0-9]+.[0-9]+.x"
-    - "fix-action-names-in-main"
 permissions:
   contents: "write"
   id-token: "write"