diff --git a/.mokogitea/workflows/pre-release.yml b/.mokogitea/workflows/pre-release.yml index 5a6966c..b34a311 100644 --- a/.mokogitea/workflows/pre-release.yml +++ b/.mokogitea/workflows/pre-release.yml @@ -4,7 +4,7 @@ # # FILE INFORMATION # DEFGROUP: Gitea.Workflow -# INGROUP: MokoCLI.Release +# INGROUP: mokocli.Release # REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli # PATH: /templates/workflows/universal/pre-release.yml.template # VERSION: 05.01.00 @@ -60,25 +60,25 @@ jobs: token: ${{ secrets.MOKOGITEA_TOKEN }} ref: ${{ github.ref_name }} - - name: Setup MokoCLI tools + - name: Setup mokocli tools env: MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting run: | - # Use pre-installed /opt/MokoCLI if available (updated by cron every 6h) - if [ -f /opt/MokoCLI/cli/version_bump.php ] && [ -f /opt/MokoCLI/cli/manifest_element.php ] && [ -f /opt/MokoCLI/vendor/autoload.php ]; then - echo Using pre-installed /opt/MokoCLI - echo MOKO_CLI=/opt/MokoCLI/cli >> $GITHUB_ENV + # Use pre-installed /opt/mokocli if available (updated by cron every 6h) + if [ -f /opt/mokocli/cli/version_bump.php ] && [ -f /opt/mokocli/cli/manifest_element.php ] && [ -f /opt/mokocli/vendor/autoload.php ]; then + echo Using pre-installed /opt/mokocli + echo MOKO_CLI=/opt/mokocli/cli >> $GITHUB_ENV else echo Falling back to fresh clone if ! command -v composer > /dev/null 2>&1; then sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1 fi - rm -rf /tmp/MokoCLI-api - CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoCLI.git - git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/MokoCLI-api - cd /tmp/MokoCLI-api && composer install --no-dev --no-interaction --quiet - echo MOKO_CLI=/tmp/MokoCLI-api/cli >> $GITHUB_ENV + rm -rf /tmp/mokocli + CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git + git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli + cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet + echo MOKO_CLI=/tmp/mokocli/cli >> $GITHUB_ENV fi - name: Detect platform