From 32e520fe3c52d8548d5c3cab1368c8c71f2eb12c Mon Sep 17 00:00:00 2001 From: SoundDrill31 <84176052+sounddrill31@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:25:00 +0530 Subject: [PATCH] Add support for riseup command This replaces breakfast when Base project is risingOS and when repo init line isn't set. Also fix quotes since inputs contexts get swapped during run so we treat them as normal text --- .github/workflows/main.yml | 9 +++++++-- .github/workflows/selfhosted.yml | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bd7f529..ccd15d61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,10 +132,15 @@ jobs: export REPO_INIT="repo init -u https://github.com/accupara/los-cm14.1.git -b cm-14.1 --git-lfs --depth=1" ;; esac - if [[ ${{ github.event.inputs.PRODUCT_NAME }} == *_* &&! (${{ github.event.inputs.PRODUCT_NAME }} == gsi_* || ${{ github.event.inputs.PRODUCT_NAME }} == sdk_*) ]]; then + + if [[ "${{ github.event.inputs.PRODUCT_NAME }}" == "*_*" &&! ("${{ github.event.inputs.PRODUCT_NAME }}" == "gsi_*" || "${{ github.event.inputs.PRODUCT_NAME }}" == "sdk_*") ]]; then LUNCH="lunch ${{ github.event.inputs.PRODUCT_NAME }}-${{ github.event.inputs.BUILD_TYPE }}" else - LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + if [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" && "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then + LUNCH="riseup ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + else + LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + fi fi echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project" diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml index 9d1924a1..75371282 100644 --- a/.github/workflows/selfhosted.yml +++ b/.github/workflows/selfhosted.yml @@ -171,10 +171,14 @@ jobs: ;; esac - if [[ ${{ github.event.inputs.PRODUCT_NAME }} == *_* &&! (${{ github.event.inputs.PRODUCT_NAME }} == gsi_* || ${{ github.event.inputs.PRODUCT_NAME }} == sdk_*) ]]; then + if [[ "${{ github.event.inputs.PRODUCT_NAME }}" == "*_*" &&! ("${{ github.event.inputs.PRODUCT_NAME }}" == "gsi_*" || "${{ github.event.inputs.PRODUCT_NAME }}" == "sdk_*") ]]; then LUNCH="lunch ${{ github.event.inputs.PRODUCT_NAME }}-${{ github.event.inputs.BUILD_TYPE }}" else - LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + if [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" && "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then + LUNCH="riseup ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + else + LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}" + fi fi echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"