From ed6950d2f94df04babf46660364306e90f0d21c0 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Tue, 13 Feb 2024 12:39:41 -0700 Subject: [PATCH] fix: manually install jsonnetfmt --- .github/jsonnetfile.lock.json | 4 ++-- .../.github/workflows/release-pr.yml | 24 +++++++++++++++++++ .../loki-release/workflows/validate.libsonnet | 16 ++++++------- .github/workflows/minor-release-pr.yml | 24 +++++++++++++++++++ .github/workflows/patch-release-pr.yml | 24 +++++++++++++++++++ 5 files changed, 82 insertions(+), 10 deletions(-) diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json index 05e7208f8804..2b7fff9197c9 100644 --- a/.github/jsonnetfile.lock.json +++ b/.github/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "" } }, - "version": "36ebc075d3f435407ae5de3defb29b467aefabfe", - "sum": "VLe68FGWuHiy2lM51HpF8dgfqdGT72/1AA5zXqJd9YU=" + "version": "63abcdd7617a65b250bc348565c97793ba9a2b20", + "sum": "oUVb+owI1ZgnH5gyO+6oW823Mi+fFMStCfsy9uMNVhk=" } ], "legacyImports": false 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 index 0d96e13bf9f3..b4f5c20c5482 100644 --- 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 @@ -31,6 +31,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -171,6 +179,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -307,6 +323,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet index 4358e0007327..f983b1b39f90 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet @@ -60,14 +60,14 @@ local setupValidationDeps = function(job) job { // tarball_binary_path: '${binary}', // smoke_test: '${binary} --version', // }), - // step.new('install jsonnetfmt', './lib/actions/install-binary') - // + step.with({ - // binary: 'jsonnetfmt', - // version: '0.18.0', - // download_url: 'https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz', - // tarball_binary_path: '${binary}', - // smoke_test: '${binary} --version', - // }), + step.new('install jsonnetfmt', './lib/actions/install-binary') + + step.with({ + binary: 'jsonnetfmt', + version: '0.18.0', + download_url: 'https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz', + tarball_binary_path: '${binary}', + smoke_test: '${binary} --version', + }), ] + job.steps, }; diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index 4c722a01d561..48a3cfd3c0bb 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -31,6 +31,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -372,6 +380,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -1188,6 +1204,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index 05aa4b96eba5..eef0e5b5f85f 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -31,6 +31,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -372,6 +380,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}" @@ -1188,6 +1204,14 @@ jobs: tar_args: "xvf" tarball_binary_path: "*/${binary}" version: "0.9.0" + - name: "install jsonnetfmt" + uses: "./lib/actions/install-binary" + with: + binary: "jsonnetfmt" + download_url: "https://github.com/google/go-jsonnet/releases/download/v${version}/go-jsonnet_${version}_Linux_x86_64.tar.gz" + smoke_test: "${binary} --version" + tarball_binary_path: "${binary}" + version: "0.18.0" - env: BUILD_IN_CONTAINER: false if: "${{ !fromJSON(env.SKIP_VALIDATION) }}"