fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! allow …

…defining a custom site
herbetom · Nov 4, 2023 · 5d6ff81 · 5d6ff81
1 parent 45921b4
commit 5d6ff81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml
@@ -48,7 +48,8 @@ jobs:
       - name: Checkout Site
         run: contrib/actions/checkout-site.sh
         env:
-          GLUON_SITE: ${{ vars.GLUON_SITE }}
+          GLUON_SITE_URL: ${{ vars.GLUON_SITE_URL }}
+          GLUON_SITE_BRANCH: ${{ vars.GLUON_SITE_BRANCH }}
 
       - name: Build
         run: contrib/actions/run-build.sh ${{ matrix.target }}

diff --git a/contrib/actions/checkout-site.sh b/contrib/actions/checkout-site.sh
@@ -2,12 +2,15 @@
 
 set -e
 
-echo "${GLUON_SITE}"
+echo "cloning ${GLUON_SITE_URL}"
 
 GLUON_SITEDIR=site
 
-if [ ! -z "$GLUON_SITE" ]; then
-	git clone ${GLUON_SITE} "${GLUON_SITEDIR}"
+if [ ! -z "GLUON_SITE_URL" ]; then
+	git clone "${GLUON_SITE_URL}" "${GLUON_SITEDIR}"
+	if [ ! -z "$GLUON_SITE_BRANCH" ]; then
+		git -C "${GLUON_SITEDIR}" checkout "${GLUON_SITE_BRANCH}"
+	fi
 	echo "GLUON_SITEDIR=${GLUON_SITEDIR}" >> "$GITHUB_ENV"
 	tree site
 fi