Merge branch 'master' into k8s-netperf

cloud-bulldozer · Nov 29, 2023 · d374988 · d374988
2 parents 0cf9b17 + 39a58bd
commit d374988
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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

diff --git a/dittybopper/syncer/entrypoint.py b/dittybopper/syncer/entrypoint.py
@@ -16,7 +16,7 @@ class GrafanaOperations:
     def __init__(self, grafana_url: str, input_directory: str, git_commit_hash: str):
         self.grafana_url = grafana_url
         self.input_directory = input_directory
-        self.git_commit_hash = git_commit_hash
+        self.git_commit_hash = git_commit_hash if git_commit_hash else ''
         self.dashboards = defaultdict(list)
         self.folder_map = dict()
         self.logger = logging.getLogger(__name__)