Skip to content

Commit 56561ee

Browse files
committed
feat: attempt arm builds again
1 parent 02b95ed commit 56561ee

12 files changed

+31
-107
lines changed

.github/jsonnetfile.lock.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": ""
99
}
1010
},
11-
"version": "8a1e8bd51ff300716cc13c448235d5d4711f429b",
12-
"sum": "1ElM0v2Zw1lq9LjNFJAQiGBn/3y3MPas+bIfGrpQ2zQ="
11+
"version": "6582474ca4ca750f4f779863d31a3c4e733082fd",
12+
"sum": "rH3t3Ckc5CFz5+oGHj7dB8d/JtBHVMMXT0RtLsC2Mmo="
1313
}
1414
],
1515
"legacyImports": false

.github/release-workflows.jsonnet

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ local build = lokiRelease.build;
1919
skipValidation=true,
2020
versioningStrategy='always-bump-patch',
2121
imagePrefix='grafana',
22+
skipArm=false,
2223
// TODO: remove temp PR branch
2324
branches=['release-[0-9].[0-9].x', 'fix-action-names-in-main'],
2425
), false, false

.github/vendor/github.com/grafana/loki-release/.github/workflows.jsonnet

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml

+3-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/.husky/pre-commit

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/main.jsonnet

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet

+3-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet

-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet

+1-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/minor-release-pr.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
path: "lib"
2424
repository: "grafana/loki-release"
25-
- name: "install dependencies"
25+
- name: "install tar"
2626
run: |
2727
apt update
2828
apt install -qy tar xz-utils
@@ -159,7 +159,7 @@ jobs:
159159
IMAGE_TAG: "${{ needs.version.outputs.version }}"
160160
SKIP_ARM: true
161161
name: "build artifacts"
162-
run: "make SKIP_ARM=true dist"
162+
run: "make dist"
163163
shell: "bash"
164164
working-directory: "release"
165165
- name: "upload build artifacts"
@@ -299,7 +299,7 @@ jobs:
299299
with:
300300
path: "lib"
301301
repository: "grafana/loki-release"
302-
- name: "install dependencies"
302+
- name: "install tar"
303303
run: |
304304
apt update
305305
apt install -qy tar xz-utils
@@ -824,7 +824,7 @@ jobs:
824824
with:
825825
path: "lib"
826826
repository: "grafana/loki-release"
827-
- name: "install dependencies"
827+
- name: "install tar"
828828
run: |
829829
apt update
830830
apt install -qy tar xz-utils

.github/workflows/patch-release-pr.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
path: "lib"
2424
repository: "grafana/loki-release"
25-
- name: "install dependencies"
25+
- name: "install tar"
2626
run: |
2727
apt update
2828
apt install -qy tar xz-utils
@@ -157,9 +157,9 @@ jobs:
157157
- env:
158158
BUILD_IN_CONTAINER: false
159159
IMAGE_TAG: "${{ needs.version.outputs.version }}"
160-
SKIP_ARM: true
160+
SKIP_ARM: false
161161
name: "build artifacts"
162-
run: "make SKIP_ARM=true dist"
162+
run: "make dist"
163163
shell: "bash"
164164
working-directory: "release"
165165
- name: "upload build artifacts"
@@ -299,7 +299,7 @@ jobs:
299299
with:
300300
path: "lib"
301301
repository: "grafana/loki-release"
302-
- name: "install dependencies"
302+
- name: "install tar"
303303
run: |
304304
apt update
305305
apt install -qy tar xz-utils
@@ -824,7 +824,7 @@ jobs:
824824
with:
825825
path: "lib"
826826
repository: "grafana/loki-release"
827-
- name: "install dependencies"
827+
- name: "install tar"
828828
run: |
829829
apt update
830830
apt install -qy tar xz-utils

0 commit comments

Comments
 (0)