Skip to content

Commit

Permalink
Merge branch 'release/6.0.43'
Browse files Browse the repository at this point in the history
* release/6.0.43:
  updating the lock file
  updating assets
  update gitpod configuration to install composer programatically
  • Loading branch information
austintoddj committed Nov 1, 2022
2 parents 195d170 + 2c03bfb commit 91dc618
Show file tree
Hide file tree
Showing 9 changed files with 1,098 additions and 1,160 deletions.
22 changes: 18 additions & 4 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,26 @@ tasks:
# Reload the .bash_profile to utilize the composer-link() function
source ~/.bash_profile
# Install Composer v2.0
# Remove any existing Composer installation
sudo rm /usr/bin/composer
# Install Composer v2.0
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
php composer-setup.php
php -r "unlink('composer-setup.php');"
ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
then
>&2 echo 'ERROR: Invalid installer checksum'
rm composer-setup.php
exit 1
fi
php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
# Make Composer globally accessible
sudo mv composer.phar /usr/bin/composer
cd /workspace
Expand Down
1,121 changes: 534 additions & 587 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/app.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@
*/

/*!
* Vue.js v2.7.8
* Vue.js v2.7.13
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/

/*!
* jQuery JavaScript Library v3.6.0
* jQuery JavaScript Library v3.6.1
* https://jquery.com/
*
* Includes Sizzle.js
Expand All @@ -108,7 +108,7 @@
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2021-03-02T17:08Z
* Date: 2022-08-26T17:52Z
*/

/*!
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=bb8b03ebe970542a35947220a376c601",
"/css/app.css": "/css/app.css?id=24cec182e4a80809167644b6cb3cf632"
"/js/app.js": "/js/app.js?id=19a8d0bf4a7b9119a792745f3d85d206",
"/css/app.css": "/css/app.css?id=be48ca71ada846a81c0b4768771667a5"
}
1,095 changes: 536 additions & 559 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 91dc618

Please sign in to comment.