feat: attempt arm builds again

grafana · Feb 14, 2024 · 56561ee · 56561ee
1 parent 02b95ed
commit 56561ee
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 107 deletions.
diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": ""
         }
       },
-      "version": "8a1e8bd51ff300716cc13c448235d5d4711f429b",
-      "sum": "1ElM0v2Zw1lq9LjNFJAQiGBn/3y3MPas+bIfGrpQ2zQ="
+      "version": "6582474ca4ca750f4f779863d31a3c4e733082fd",
+      "sum": "rH3t3Ckc5CFz5+oGHj7dB8d/JtBHVMMXT0RtLsC2Mmo="
     }
   ],
   "legacyImports": false

diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
@@ -19,6 +19,7 @@ local build = lokiRelease.build;
       skipValidation=true,
       versioningStrategy='always-bump-patch',
       imagePrefix='grafana',
+      skipArm=false,
       // TODO: remove temp PR branch
       branches=['release-[0-9].[0-9].x', 'fix-action-names-in-main'],
     ), false, false

diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows.jsonnet b/.github/vendor/github.com/grafana/loki-release/.github/workflows.jsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml
diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml
diff --git a/.github/vendor/github.com/grafana/loki-release/.husky/pre-commit b/.github/vendor/github.com/grafana/loki-release/.husky/pre-commit
diff --git a/.github/vendor/github.com/grafana/loki-release/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/main.jsonnet
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/common.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils
@@ -159,7 +159,7 @@ jobs:
         IMAGE_TAG: "${{ needs.version.outputs.version }}"
         SKIP_ARM: true
       name: "build artifacts"
-      run: "make SKIP_ARM=true dist"
+      run: "make dist"
       shell: "bash"
       working-directory: "release"
     - name: "upload build artifacts"
@@ -299,7 +299,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils
@@ -824,7 +824,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils
@@ -157,9 +157,9 @@ jobs:
     - env:
         BUILD_IN_CONTAINER: false
         IMAGE_TAG: "${{ needs.version.outputs.version }}"
-        SKIP_ARM: true
+        SKIP_ARM: false
       name: "build artifacts"
-      run: "make SKIP_ARM=true dist"
+      run: "make dist"
       shell: "bash"
       working-directory: "release"
     - name: "upload build artifacts"
@@ -299,7 +299,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils
@@ -824,7 +824,7 @@ jobs:
       with:
         path: "lib"
         repository: "grafana/loki-release"
-    - name: "install dependencies"
+    - name: "install tar"
       run: |
         apt update
         apt install -qy tar xz-utils