Merge pull request #200 from Ajpantuso/apantuso/jenkins_refactor

ci: refactor jenkins env setup
mt-sre · Sep 28, 2022 · 4fe327b · 4fe327b
2 parents 45e539f + d728d2c
commit 4fe327b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/build_tag.sh b/build_tag.sh
@@ -2,4 +2,6 @@
 
 set -exvo pipefail -o nounset
 
+source "${PWD}/cicd/jenkins_env.sh"
+
 ./mage release:cli
diff --git a/cicd/jenkins_env.sh b/cicd/jenkins_env.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -exvo pipefail -o nounset
+
+GO_1_18="/opt/go/1.18.1/bin"
+
+if [ -d  "${GO_1_18}" ]; then
+     PATH="${GO_1_18}:${PATH}"
+fi
diff --git a/pr_check.sh b/pr_check.sh
@@ -2,11 +2,7 @@
 
 set -exvo pipefail -o nounset
 
-GO_1_18="/opt/go/1.18.1/bin"
-
-if [ -d  "${GO_1_18}" ]; then
-     PATH="${GO_1_18}:${PATH}"
-fi
+source "${PWD}/cicd/jenkins_env.sh"
 
 # pre-emptively install go-sqlite3 to ensure amalgamated libsqlite3
 # source is present for compilation.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@

		set -exvo pipefail -o nounset

		source "${PWD}/cicd/jenkins_env.sh"

		./mage release:cli