Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add magento 2.4.0 and 2.4.1 #54

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .m2c/bin/m2c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ m2c_install() {
fi

if [[ ! -f "${m2c_global_dir}/mutagen/mutagen" || \
"$("${m2c_global_dir}/mutagen/mutagen" version)" != "0.11.5" ]]
"$("${m2c_global_dir}/mutagen/mutagen" version)" != "0.11.8" ]]
then
if [[ ! -f "${m2c_global_dir}/mutagen/mutagen" ]]
then
Expand All @@ -558,7 +558,7 @@ m2c_install() {
fi

curl -L \
"https://github.com/mutagen-io/mutagen/releases/download/v0.11.5/mutagen_darwin_amd64_v0.11.5.tar.gz" | \
"https://github.com/mutagen-io/mutagen/releases/download/v0.11.8/mutagen_darwin_amd64_v0.11.8.tar.gz" | \
tar xzf - -o -C "${m2c_global_dir}/mutagen/"
chmod 0755 "${m2c_global_dir}/mutagen/mutagen"
fi
Expand Down
16 changes: 11 additions & 5 deletions .m2c/functions/m2c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ then
exit 1
fi

declare -r m2c_varnish_versions=("5.2" "4.1" "6.2")
declare -r m2c_elasticsearch_versions=("7.8" "7.7" "7.6" "7.5" "7.4" "7.3" "7.2" "7.1" "7.0"
declare -r m2c_varnish_versions=("5.2" "4.1" "6.2" "6.6")
declare -r m2c_elasticsearch_versions=("7.12" "7.11" "7.10" "7.9" "7.8" "7.7" "7.6" "7.5" "7.4" "7.3" "7.2" "7.1" "7.0" \
"6.8" "6.7" "6.6" "6.5" "6.4" "6.3" "6.2" "6.1" "6.0" \
"5.6" "5.5" "5.4" "5.3" "5.2" "5.1" "5.0" \
"2.4" "2.3" "2.2" "2.1" "2.0")
Expand Down Expand Up @@ -1274,7 +1274,8 @@ m2c_init() {
local m2c_php_versions=("7.4" "7.3" "7.2" "7.1" "7.0" "5.6")
local m2c_mariadb_versions=("10.4" "10.3" "10.2" "10.1" "10.0")
local m2c_redis_versions=("5.0" "4.0" "3.2")
local m2c_magento_versions=("2.3.5" "2.3.4" "2.3.3" "2.3.2" "2.3.1" "2.3.0" \
local m2c_magento_versions=("2.4.2" "2.4.1" "2.4.0" \
"2.3.5" "2.3.4" "2.3.3" "2.3.2" "2.3.1" "2.3.0" \
"2.2.9" "2.2.8" "2.2.7" "2.2.6" "2.2.5" "2.2.4" "2.2.3" "2.2.2" "2.2.1" "2.2.0" \
"2.1.18" "2.1.17" "2.1.16" "2.1.15" "2.1.14" "2.1.13" "2.1.12" "2.1.11" "2.1.10" \
"2.1.9" "2.1.8" "2.1.7" "2.1.6" "2.1.5" "2.1.4" "2.1.3" "2.1.2" "2.1.1" "2.1.0" \
Expand Down Expand Up @@ -1769,6 +1770,11 @@ m2c_init() {
--db-name="${M2C_CFG_MYSQL_DATABASE}" \
--db-user="${M2C_CFG_MYSQL_USER}" \
--db-password="${M2C_CFG_MYSQL_PASSWORD}" \
--elasticsearch-host="elasticsearch.${M2C_CFG_DOMAIN_NAME}" \
--elasticsearch-port="9200" \
--elasticsearch-enable-auth="0" \
--elasticsearch-index-prefix="${M2C_CFG_DOMAIN_NAME}" \
--elasticsearch-timeout="15" \
--base-url="https://${M2C_CFG_DOMAIN_NAME}/" \
--admin-firstname="${M2C_CFG_ADMIN_FIRSTNAME}" \
--admin-lastname="${M2C_CFG_ADMIN_LASTNAME}" \
Expand Down Expand Up @@ -2050,9 +2056,9 @@ m2c_init_help() {
--php-version <7.4> Set PHP version.
--mariadb-version <10.3> Set MariaDB version.
--redis-version <5.0> Set Redis version.
--varnish-version <5.2> Set Varnish version, applicable only when
--varnish-version <6.6> Set Varnish version, applicable only when
--varnish option is present.
--elasticsearch-version <6.8> Set Elasticsearch version. Applicable only
--elasticsearch-version <7.12> Set Elasticsearch version. Applicable only
when --elasticsearch option is present.
--rabbitmq-version <3.7> Set RabbitMQ version. Applicable only when
--rabbitmq option is present.
Expand Down
Loading