Skip to content

Commit

Permalink
add input office-chooser
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernhard Landauer authored and Bernhard Landauer committed Sep 7, 2021
1 parent bdfc9d0 commit c991830
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions action.yml
Expand Up @@ -33,6 +33,10 @@ inputs:
release-tag:
description: 'release tag to upload to (if set)'
required: false
office-chooser:
description: 'include CAL office installer module'
required: false
default: false
gpg-secret-key-base64:
description: 'base64 encoded gpg secret key (without a passphrase) to sign the zip (if set)'
required: false
Expand Down Expand Up @@ -214,9 +218,11 @@ runs:
VERSION: ${{ inputs.version }}
KERNEL: ${{ inputs.kernel }}
CODE_NAME: ${{ inputs.code-name }}
OFFICE: ${{ inputs.office-chooser }}
run: |
echo "## building iso"
[ "$SCOPE" == "minimal" ] && unset SCOPE
[ "$OFFICE" == "false" ] && unset OFFICE
# source the version info from current release info
source <(curl -s https://gitlab.manjaro.org/packages/core/manjaro-release/-/raw/master/lsb-release)
Expand All @@ -227,8 +233,8 @@ runs:
sudo sed -i -e "s|dist_release=\$(get_release)|dist_release=${VERSION:-$DISTRIB_RELEASE}|g" /usr/lib/manjaro-tools/util.sh
sudo sed -i -e "s|dist_codename=\$(get_codename)|dist_codename=\"${CODE_NAME:-$DISTRIB_CODENAME}\"|g" /usr/lib/manjaro-tools/util.sh
sudo buildiso ${SCOPE:+-f} -p $EDITION -b $BRANCH -k $KERNEL
sudo buildiso ${SCOPE:+-f} -p $EDITION -b $BRANCH -k $KERNEL ${OFFICE:+-o}
sudo rm -Rf /var/lib/manjaro-tools/buildiso/*
OUTPUT_ISO_PATH=$(find /var/cache/manjaro-tools/iso -type f -name "*.iso" -exec stat -c '%Y %n' {} \; | sort -nr | awk 'NR==1 {print $2}')
Expand Down

0 comments on commit c991830

Please sign in to comment.