Merge pull request #76 from bleggett/bleggett/styrojailpub

Publish `styrojail` binary with release

Author: bleggett

.github/workflows/publish.yaml

@@ -75,7 +75,6 @@ jobs:
         run: |
           tag_name="${TAG_NAME}"
           [ -z $tag_name ] && tag_name="${DEFAULT_BRANCH}"
-          export STYROLITE_FORM='styrolite'
           export STYROLITE_TAG_NAME="${tag_name}"
           export STYROLITE_PLATFORM
           export STYROLITE_RELEASE_DIR='target/*/release'

hack/ci/assemble-release-assets.sh

@@ -18,11 +18,6 @@ asset() {
   cd "${previous}"
 }
 
-if [ -z "${STYROLITE_FORM}" ]; then
-  echo "STYROLITE_FORM env is missing"
-  exit 1
-fi
-
 if [ -z "${STYROLITE_TAG_NAME}" ]; then
   echo "STYROLITE_TAG_NAME env is missing"
   exit 1
@@ -38,31 +33,24 @@ if [ -z "${STYROLITE_RELEASE_DIR}" ]; then
   exit 1
 fi
 
-FORM="${STYROLITE_FORM}"
+FORMS="styrolite styrojail"
 TAG_NAME="${STYROLITE_TAG_NAME}"
 PLATFORM="${STYROLITE_PLATFORM}"
 
 mkdir -p target/assets
-
-for SOURCE_FILE_PATH in ${STYROLITE_RELEASE_DIR}; do
-  echo "handling $SOURCE_FILE_PATH"
-  if [ "${FORM}" = "styrolite" ]; then
+for FORM in ${FORMS}; do
+  for SOURCE_FILE_PATH in ${STYROLITE_RELEASE_DIR}; do
+    echo "handling $SOURCE_FILE_PATH"
     SUFFIX=""
     if echo "${PLATFORM}" | grep "^windows-" >/dev/null; then
       SUFFIX=".exe"
     fi
-
     # For backwards-compatibility
     # Strip off the binary name down to the directory.
     directory="${SOURCE_FILE_PATH%/"$FORM""$SUFFIX"}"
-
     # Expand wildcard path
     artifact_path=$(find "${directory}" -name "${FORM}${SUFFIX}" -type f)
     echo "Found: ${artifact_path}"
-
-    asset "${artifact_path}" "target/assets/styrolite_${TAG_NAME}_${PLATFORM}${SUFFIX}"
-  else
-    echo "ERROR: Unknown form '${FORM}'"
-    exit 1
-  fi
+    asset "${artifact_path}" "target/assets/${FORM}_${TAG_NAME}_${PLATFORM}${SUFFIX}"
+  done
 done