Skip to content

Commit

Permalink
Simpify lunch logic and fix logical errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sounddrill31 authored Jul 24, 2024
1 parent db28211 commit 88b9505
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,12 @@ 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
if [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" && "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then
elif [[ "${{ 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
else
LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}"
fi
fi
echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/selfhosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,12 @@ 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
if [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" && "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then
elif [[ "${{ 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
else
LUNCH="breakfast ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}"
fi
fi
echo "Building on ${{ github.event.inputs.BASE_PROJECT }} project"
Expand Down

0 comments on commit 88b9505

Please sign in to comment.