Skip to content

Commit

Permalink
Merge pull request #1022 from seth-reeser/develop-catapult
Browse files Browse the repository at this point in the history
Develop catapult
  • Loading branch information
seth-reeser authored Apr 13, 2021
2 parents c920438 + 1f2bade commit a8c86b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 4.2.0
version: 4.2.1
major:
description: "Catapult uses Semantic Versioning. During a MAJOR increment, incompatable API changes are made which require a manual upgrade path. Please follow these directions:"
notice: "NEW MAJOR VERSION OF CATAPULT AVAILABLE"
Expand Down
11 changes: 6 additions & 5 deletions provisioners/redhat/modules/software_tools.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source "/catapult/provisioners/redhat/modules/catapult.sh"


# install dependancies, relies on php.sh
# install dependencies, relies on php.sh
sudo yum install -y mariadb
sudo yum install -y unzip


echo "> configuring composer"
Expand Down Expand Up @@ -50,8 +51,8 @@ fi
# update to specific drush version
cd /usr/local/src/drush \
&& git fetch \
&& git checkout --force 8.3.2 \
&& composer install
&& git checkout --force 8.4.8 \
&& composer-php71 install
# configure php version
# http://docs.drush.org/en/master/install/
if ! grep -q "export DRUSH_PHP='/opt/rh/rh-php71/root/usr/bin/php'" ~/.bashrc; then
Expand All @@ -70,8 +71,8 @@ fi
# update to specific drush version
cd /usr/local/src/drush10 \
&& git fetch \
&& git checkout --force 10.2.2 \
&& composer install
&& git checkout --force 10.4.0 \
&& composer-php72 install
if ! grep -q "alias drush10='/opt/rh/rh-php72/root/usr/bin/php /usr/local/src/drush10/drush'" ~/.bashrc; then
sudo bash -c "echo -e \"\nalias drush10='/opt/rh/rh-php72/root/usr/bin/php /usr/local/src/drush10/drush'\" >> ~/.bashrc"
fi
Expand Down

0 comments on commit a8c86b8

Please sign in to comment.