From bbcb72fca8d0eddb3f11e4ce692d769ad0d0c705 Mon Sep 17 00:00:00 2001 From: Krishna Harsha Voora Date: Thu, 9 Nov 2023 11:25:02 +0530 Subject: [PATCH 1/2] Updates to Makefile & GHA This PR will users to pull architecture specific binaries instead of always pulling x86 binaries Signed-off-by: Krishna Harsha Voora --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- Makefile | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db020a7..683e0b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Compile dashboards run: make build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40df6c2..47178ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies required for multi-arch builds run: sudo apt-get update && sudo apt-get install qemu-user-static podman fuse-overlayfs diff --git a/Makefile b/Makefile index 71dcc65..3093b07 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ -JSONNET := https://github.com/google/go-jsonnet/releases/download/v0.20.0/go-jsonnet_0.20.0_Linux_x86_64.tar.gz -JB = https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-linux-amd64 +ARCH := $(shell arch) +OS_TYPE := $(shell uname) +JB_OS_TYPE := $(shell uname | tr '[:upper:]' '[:lower:]') +JSONNET := https://github.com/google/go-jsonnet/releases/download/v0.20.0/go-jsonnet_0.20.0_$(OS_TYPE)_$(ARCH).tar.gz +JB = https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-$(JB_OS_TYPE)-$(ARCH) BINDIR = bin TEMPLATESDIR = templates OUTPUTDIR = rendered From a367216fca16e7e05be7dbe8fa0a0aba8d9c3353 Mon Sep 17 00:00:00 2001 From: Krishna Harsha Voora Date: Thu, 9 Nov 2023 11:36:40 +0530 Subject: [PATCH 2/2] Update to the GHA Actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 683e0b4..fdc3f28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Get dependencies run: make deps