Skip to content

Commit e8919ec

Browse files
TNW-2094: TNW_Marketing dependency update
1 parent 0c5da80 commit e8919ec

2 files changed

Lines changed: 7 additions & 111 deletions

File tree

.circleci/config.yml

Lines changed: 5 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -38,94 +38,6 @@ jobs:
3838
chmod +x git_release.sh
3939
./git_release.sh
4040
41-
m243-commerce-php74: &base-image243
42-
docker:
43-
- image: powersync/magento-builds:m243-commerce-php74
44-
auth:
45-
username: $DOCKER_USER
46-
password: $DOCKER_PASS
47-
- image: circleci/mysql:8.0
48-
environment:
49-
MYSQL_PASSWORD: mage
50-
MYSQL_USER: mage
51-
MYSQL_DATABASE: magento
52-
MYSQL_ROOT_PASSWORD: docker
53-
resource_class: large
54-
working_directory: ~/tnw_extension
55-
steps:
56-
- checkout
57-
- run:
58-
name: Reinstall Composer
59-
command: |
60-
cd ~
61-
curl -sS https://getcomposer.org/installer -o composer-setup.php
62-
sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
63-
cd /var/www/html/magento/
64-
composer --no-plugins config allow-plugins true
65-
- run:
66-
name: Wait for DB
67-
command: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
68-
- run:
69-
name: Installing Magento
70-
command: |
71-
cd /var/www/html/magento/
72-
composer config -g http-basic.repo.magento.com $MAGENTO_REPO_LOGIN $MAGENTO_REPO_PASSWORD
73-
./bin/magento setup:install --backend-frontname admin --db-host 127.0.0.1 --db-prefix tnwc_ --db-name magento --db-user mage --db-password mage --base-url http://magento-qa.box/ --language en_US --timezone America/Chicago --currency USD --admin-lastname Admin --admin-firstname Admin --admin-email admin@example.com --admin-user admin --admin-password admin123 --cleanup-database --use-rewrites 1
74-
./bin/magento --version
75-
- run:
76-
name: Checkout related modules
77-
command: |
78-
cd /var/www/html/magento/
79-
80-
for moduleName in $MODULES_NAME; do
81-
composer config repositories.TNW_$moduleName git git@github.com:PowerSync/TNW_$moduleName.git
82-
moduleNameLower=(`echo $moduleName| tr '[:upper:]' '[:lower:]'`)
83-
if [[ $moduleNameLower == 'stripe' ]]; then
84-
moduleNameLower="module-${moduleNameLower}"
85-
fi
86-
set +e
87-
branchExists=(`composer info -a tnw/$moduleNameLower|grep "versions : .*dev-$CIRCLE_BRANCH[^0-9a-zA-Z-]"`)
88-
set -e
89-
COMPOSER_BRANCH="dev-"
90-
if test -z "$branchExists"
91-
then
92-
COMPOSER_BRANCH="${COMPOSER_BRANCH}develop"
93-
else
94-
COMPOSER_BRANCH="${COMPOSER_BRANCH}${CIRCLE_BRANCH}"
95-
fi
96-
COMPOSER_MEMORY_LIMIT=-1 composer require --with-all-dependencies --prefer-source tnw/${moduleNameLower}:"${COMPOSER_BRANCH}"
97-
COMPOSER_TAG=$(grep -o '^ *"version": *"[0-9\.]*"' vendor/tnw/${moduleNameLower}/composer.json|awk '{print $2}'|sed -e 's/"\(.*\)"/\1/g')
98-
COMPOSER_MEMORY_LIMIT=-1 composer require --no-update --prefer-source tnw/${moduleNameLower}:"${COMPOSER_BRANCH} as ${COMPOSER_TAG}"
99-
done
100-
- run:
101-
name: Install the Extension
102-
command: |
103-
cd /var/www/html/magento
104-
rm -rf ./generated/*
105-
./bin/magento module:status
106-
./bin/magento module:enable --all
107-
./bin/magento setup:upgrade
108-
- run:
109-
name: Compile the Code
110-
command: |
111-
cd /var/www/html/magento
112-
php bin/magento setup:di:compile
113-
php bin/magento deploy:mode:set developer
114-
115-
m243-open_source-php74:
116-
<<: *base-image243
117-
docker:
118-
- image: powersync/magento-builds:m243-open_source-php74
119-
auth:
120-
username: $DOCKER_USER
121-
password: $DOCKER_PASS
122-
- image: circleci/mysql:8.0
123-
environment:
124-
MYSQL_PASSWORD: mage
125-
MYSQL_USER: mage
126-
MYSQL_DATABASE: magento
127-
MYSQL_ROOT_PASSWORD: docker
128-
12941
m244-commerce-php81: &base-image244
13042
docker:
13143
- image: powersync/magento-builds:m244-commerce-php815-elastic716
@@ -177,7 +89,7 @@ jobs:
17789
COMPOSER_BRANCH="dev-"
17890
if test -z "$branchExists"
17991
then
180-
COMPOSER_BRANCH="${COMPOSER_BRANCH}develop"
92+
COMPOSER_BRANCH="${COMPOSER_BRANCH}develop-2.4.4"
18193
else
18294
COMPOSER_BRANCH="${COMPOSER_BRANCH}${CIRCLE_BRANCH}"
18395
fi
@@ -344,7 +256,7 @@ jobs:
344256
path: /tmp/artifacts
345257

346258
magento-coding-standard:
347-
<<: *base-image243
259+
<<: *base-image244
348260
working_directory: ~/tnw_extension
349261
steps:
350262
- checkout
@@ -354,7 +266,7 @@ jobs:
354266
/var/www/html/magento/vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --severity=10 --ignore-annotations $CIRCLE_WORKING_DIRECTORY
355267
356268
check-composer-installation:
357-
<<: *base-image243
269+
<<: *base-image244
358270
steps:
359271
- checkout
360272
- run:
@@ -470,33 +382,19 @@ workflows:
470382

471383
test-deploy-wiki:
472384
jobs:
473-
- m243-commerce-php74:
474-
context: powersync
475-
filters:
476-
branches:
477-
only:
478-
- /.*/
479-
480-
- m243-open_source-php74:
481-
context: powersync
482-
filters:
483-
branches:
484-
only:
485-
- /.*/
486-
487385
- m244-commerce-php81:
488386
context: powersync
489387
filters:
490388
branches:
491389
only:
492-
- master
390+
- /.*/
493391

494392
- m244-open_source-php81:
495393
context: powersync
496394
filters:
497395
branches:
498396
only:
499-
- master
397+
- /.*/
500398

501399
- cloud-docker-245ee:
502400
context: powersync
@@ -532,8 +430,6 @@ workflows:
532430
context: powersync
533431
requires:
534432
- magento-coding-standard
535-
- m243-commerce-php74
536-
- m243-open_source-php74
537433
- m244-commerce-php81
538434
- m244-open_source-php81
539435
- cloud-docker-245ee

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"version": "2.3.26",
66
"license": "OSL-3.0",
77
"require": {
8-
"magento/framework": ">100",
9-
"tnw/marketing": "~2",
8+
"magento/framework": ">=103.0.4",
9+
"tnw/marketing": "^2.10.2",
1010
"stripe/stripe-php": "^7"
1111
},
1212
"autoload": {

0 commit comments

Comments
 (0)