Skip to content

Commit

Permalink
🤖 TEST: fix for #209
Browse files Browse the repository at this point in the history
  • Loading branch information
apolopena committed Mar 5, 2022
1 parent 111675e commit f420ee1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ RUN bash -c ". /tmp/update-composer.sh" && rm /tmp/update-composer.sh
RUN bash -c ". /tmp/scaffold-project.sh" && rm /tmp/scaffold-project.sh

# Force the docker image to build by incrementing this value
ENV INVALIDATE_CACHE=306
ENV INVALIDATE_CACHE=307
21 changes: 12 additions & 9 deletions .gp/bash/init-optional-scaffolding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ rrd_ver=$(eval "$parse" react-router-dom version)
laravel_major_ver=$(bash .gp/bash/helpers.sh laravel_major_version)
laravel_ui_ver=$(bash .gp/bash/helpers.sh laravel_ui_version)
init_phpmyadmin=".gp/bash/init-phpmyadmin.sh"
react_examp_warn1="WARNING: React examples require Laravel version >= 8."
react_examp_warn2="WARNING: Ignoring the example requested:"

# Any value set for EXAMPLE will build an example project thus superceding some directives in starter.ini
if [[ -n $EXAMPLE ]]; then
Expand All @@ -35,11 +37,16 @@ if [[ -n $EXAMPLE ]]; then
case $EXAMPLE in
1)
example_title="React Example with phpMyAdmin and extras - Questions and Answers"
init_react_example=".gp/bash/examples/init-react-example.sh"
install_react=1
install_phpmyadmin=1
install_react_router_dom=1
rrd_ver='^5.2.0'
if [[ $laravel_major_ver -lt 8 ]]; then
log -e "$react_examp_warn1 Your Laravel version is $laravel_major_ver"
log -e "$react_examp_warn2 $example_title"
else
init_react_example=".gp/bash/examples/init-react-example.sh"
install_react=1
install_phpmyadmin=1
install_react_router_dom=1
rrd_ver='^5.2.0'
fi
;;
2)
example_title="React Example without phpMyAdmin and no extras - Questions and Answers"
Expand Down Expand Up @@ -254,10 +261,6 @@ fi
# BEGIN: optional example setup
# Initialize optional react example project
if [[ -n $init_react_example ]];then
[[ $laravel_major_ver -lt 8 ]] \
&& log -e "WARNING: React examples require Laravel version >= 8. Your Laravel version is $laravel_major_ver" \
&& log -e "WARNING: Ignoring the example requested: $example_title" \
&& exit
# shellcheck source=.gp/bash/examples/init-react-example.sh
. "$init_react_example" 2>/dev/null || log_silent -e "ERROR: $(. $init_react_example 2>&1 1>/dev/null)"
exit
Expand Down
4 changes: 2 additions & 2 deletions starter.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type=laravel-js-2space
# https://github.com/gitpod-io/workspace-images/blob/master/chunks/tool-nginx/Dockerfile
# Invalid values will default to 'gitpodlatest'
# Note: Laravel 9.* requires PHP 8.*
version=8.0
version=gitpodlatest
# ppa, valid values are OS and ondrej
# The value 'OS' will use the standard (default) operating system PPA
# The value 'ondrej' will use ppa:ondrej/php
Expand Down Expand Up @@ -121,7 +121,7 @@ install=0
# Laravel always gives you the latest or most stable Minor and Patch versions which are non-breaking.
# The version value is for initial setup only and is ignored once the Laravel scaffolding have been pushed
# to your repository.
version=9.*
version=7.*
# allow_mixed_web
# Valid values are 0 (off) or 1 (on). Only turn this off if you know what you are doing.
# Default value is 1
Expand Down

0 comments on commit f420ee1

Please sign in to comment.