action: allow overriding default site-version

freifunk-gluon · Dec 13, 2023 · 4b71a31 · 4b71a31
1 parent 0213c67
commit 4b71a31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,12 @@ Path to Gluon site-directory
 Working Directory
 
 
+### site-version
+#### Description
+Optional Argument defining the version-string of the site.
+This overrides Gluons default site-versioning.
+
+
 ### autoremove
 #### Description
 Remove build-directories after build

diff --git a/action.yml b/action.yml
@@ -34,6 +34,8 @@ inputs:
     description: Priority indicator for the autoupdater
   release:
     description: 'Version string for the release to use'
+  site-version:
+    description: 'Version string for the site to use'
 runs:
   using: 'composite'
   steps:
@@ -57,6 +59,7 @@ runs:
           --env ACTION_GLUON_DEPRECATED \
           --env ACTION_GLUON_PRIORITY \
           --env ACTION_GLUON_RELEASE \
+          --env ACTION_GLUON_SITE_VERSION \
           --env ACTION_GLUON_TARGET \
           --volume "$GITHUB_WORKSPACE/$ACTION_SITE_PATH:/gluon/site-repo" \
           --volume "$GITHUB_WORKSPACE/$ACTION_GLUON_PATH:/gluon/gluon-repo" \
@@ -69,6 +72,7 @@ runs:
         ACTION_GLUON_DEPRECATED: ${{ inputs.deprecated }}
         ACTION_GLUON_PRIORITY: ${{ inputs.priority }}
         ACTION_GLUON_RELEASE: ${{ inputs.release }}
+        ACTION_GLUON_SITE_VERSION: ${{ inputs.site-version }}
         ACTION_GLUON_TARGET: ${{ inputs.hardware-target }}
         ACTION_MAKE_TARGET: ${{ inputs.make-target }}
         ACTION_GLUON_PATH: ${{ inputs.gluon-path }}

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -13,6 +13,7 @@ GLUON_MAKE_ARGS=""
 [ -n "${ACTION_GLUON_AUTOUPDATER_ENABLED+x}" ] && GLUON_MAKE_ARGS="${GLUON_MAKE_ARGS} GLUON_AUTOUPDATER_ENABLED=${ACTION_GLUON_AUTOUPDATER_ENABLED}"
 [ -n "${ACTION_GLUON_RELEASE+x}" ] && GLUON_MAKE_ARGS="${GLUON_MAKE_ARGS} GLUON_RELEASE=${ACTION_GLUON_RELEASE}"
 [ -n "${ACTION_GLUON_PRIORITY+x}" ] && GLUON_MAKE_ARGS="${GLUON_MAKE_ARGS} GLUON_PRIORITY=${ACTION_GLUON_PRIORITY}"
+[ -n "${ACTION_GLUON_SITE_VERSION}" ] && GLUON_MAKE_ARGS="${GLUON_MAKE_ARGS} GLUON_SITE_VERSION=${ACTION_GLUON_SITE_VERSION}"
 
 echo "Building with ${BUILD_THREADS} threads"
 echo "Extra args for build: '${GLUON_MAKE_ARGS}'"