Skip to content

Commit fbaa061

Browse files
AlexSkrypnykAlexSkrypnyk
committed
[#2030] Show login link on ahoy provision.
1 parent ada9263 commit fbaa061

22 files changed

Lines changed: 51 additions & 49 deletions

File tree

‎.ahoy.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ commands:
2727
#;< DRUPAL_THEME
2828
ahoy fe # Build front-end assets.
2929
#;> DRUPAL_THEME
30-
ahoy provision # Provision the site.
30+
VORTEX_SHOW_LOGIN=0 ahoy provision # Provision the site.
3131
VORTEX_SHOW_LOGIN=1 ahoy info # Show information and a login link.
3232
3333
info:
@@ -141,6 +141,7 @@ commands:
141141
ahoy confirm "Running this command will remove your current database. Are you sure?" || exit 0
142142
[ -n "${VORTEX_DB_IMAGE}" ] && AHOY_CONFIRM_RESPONSE=y ahoy reload-db
143143
ahoy cli ./scripts/vortex/provision.sh
144+
[ "${VORTEX_SHOW_LOGIN:-1}" = "1" ] && ahoy login || true
144145
145146
export-db:
146147
usage: Export database dump or database image (if VORTEX_DB_IMAGE variable is set).

‎.vortex/installer/tests/Fixtures/install/_baseline/.ahoy.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ commands:
2222
ahoy composer install # Install Composer dependencies.
2323
ahoy fei # Install front-end dependencies.
2424
ahoy fe # Build front-end assets.
25-
ahoy provision # Provision the site.
25+
VORTEX_SHOW_LOGIN=0 ahoy provision # Provision the site.
2626
VORTEX_SHOW_LOGIN=1 ahoy info # Show information and a login link.
2727
2828
info:
@@ -132,6 +132,7 @@ commands:
132132
ahoy confirm "Running this command will remove your current database. Are you sure?" || exit 0
133133
[ -n "${VORTEX_DB_IMAGE}" ] && AHOY_CONFIRM_RESPONSE=y ahoy reload-db
134134
ahoy cli ./scripts/vortex/provision.sh
135+
[ "${VORTEX_SHOW_LOGIN:-1}" = "1" ] && ahoy login || true
135136
136137
export-db:
137138
usage: Export database dump or database image (if VORTEX_DB_IMAGE variable is set).

‎.vortex/installer/tests/Fixtures/install/theme_claro/.ahoy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
ahoy composer install # Install Composer dependencies.
44
ahoy fei # Install front-end dependencies.
55
- ahoy fe # Build front-end assets.
6-
ahoy provision # Provision the site.
6+
VORTEX_SHOW_LOGIN=0 ahoy provision # Provision the site.
77
VORTEX_SHOW_LOGIN=1 ahoy info # Show information and a login link.
88

9-
@@ -156,22 +155,7 @@
9+
@@ -157,22 +156,7 @@
1010
usage: Install front-end assets.
1111
cmd: |
1212
ahoy cli "yarn install --frozen-lockfile"
@@ -29,15 +29,15 @@
2929
lint:
3030
usage: Lint back-end and front-end code.
3131
cmd: |
32-
@@ -192,7 +176,6 @@
32+
@@ -193,7 +177,6 @@
3333
cmd: |
3434
ahoy cli vendor/bin/twig-cs-fixer lint
3535
ahoy cli "yarn run lint"
3636
- ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
3737

3838
lint-tests:
3939
usage: Lint tests code.
40-
@@ -216,7 +199,6 @@
40+
@@ -217,7 +200,6 @@
4141
cmd: |
4242
ahoy cli vendor/bin/twig-cs-fixer lint --fix
4343
ahoy cli "yarn run lint-fix"

‎.vortex/installer/tests/Fixtures/install/theme_olivero/.ahoy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
ahoy composer install # Install Composer dependencies.
44
ahoy fei # Install front-end dependencies.
55
- ahoy fe # Build front-end assets.
6-
ahoy provision # Provision the site.
6+
VORTEX_SHOW_LOGIN=0 ahoy provision # Provision the site.
77
VORTEX_SHOW_LOGIN=1 ahoy info # Show information and a login link.
88

9-
@@ -156,22 +155,7 @@
9+
@@ -157,22 +156,7 @@
1010
usage: Install front-end assets.
1111
cmd: |
1212
ahoy cli "yarn install --frozen-lockfile"
@@ -29,15 +29,15 @@
2929
lint:
3030
usage: Lint back-end and front-end code.
3131
cmd: |
32-
@@ -192,7 +176,6 @@
32+
@@ -193,7 +177,6 @@
3333
cmd: |
3434
ahoy cli vendor/bin/twig-cs-fixer lint
3535
ahoy cli "yarn run lint"
3636
- ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
3737

3838
lint-tests:
3939
usage: Lint tests code.
40-
@@ -216,7 +199,6 @@
40+
@@ -217,7 +200,6 @@
4141
cmd: |
4242
ahoy cli vendor/bin/twig-cs-fixer lint --fix
4343
ahoy cli "yarn run lint-fix"

‎.vortex/installer/tests/Fixtures/install/theme_stark/.ahoy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
ahoy composer install # Install Composer dependencies.
44
ahoy fei # Install front-end dependencies.
55
- ahoy fe # Build front-end assets.
6-
ahoy provision # Provision the site.
6+
VORTEX_SHOW_LOGIN=0 ahoy provision # Provision the site.
77
VORTEX_SHOW_LOGIN=1 ahoy info # Show information and a login link.
88

9-
@@ -156,22 +155,7 @@
9+
@@ -157,22 +156,7 @@
1010
usage: Install front-end assets.
1111
cmd: |
1212
ahoy cli "yarn install --frozen-lockfile"
@@ -29,15 +29,15 @@
2929
lint:
3030
usage: Lint back-end and front-end code.
3131
cmd: |
32-
@@ -192,7 +176,6 @@
32+
@@ -193,7 +177,6 @@
3333
cmd: |
3434
ahoy cli vendor/bin/twig-cs-fixer lint
3535
ahoy cli "yarn run lint"
3636
- ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
3737

3838
lint-tests:
3939
usage: Lint tests code.
40-
@@ -216,7 +199,6 @@
40+
@@ -217,7 +200,6 @@
4141
cmd: |
4242
ahoy cli vendor/bin/twig-cs-fixer lint --fix
4343
ahoy cli "yarn run lint-fix"

‎.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/.ahoy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@@ -175,18 +175,9 @@
1+
@@ -176,18 +176,9 @@
22
lint:
33
usage: Lint back-end and front-end code.
44
cmd: |
@@ -17,7 +17,7 @@
1717
lint-fe:
1818
usage: Lint front-end code.
1919
cmd: |
20-
@@ -202,14 +193,7 @@
20+
@@ -203,14 +194,7 @@
2121
lint-fix:
2222
usage: Fix lint issues of back-end and front-end code.
2323
cmd: |

‎.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/.ahoy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@@ -175,18 +175,9 @@
1+
@@ -176,18 +176,9 @@
22
lint:
33
usage: Lint back-end and front-end code.
44
cmd: |
@@ -17,7 +17,7 @@
1717
lint-fe:
1818
usage: Lint front-end code.
1919
cmd: |
20-
@@ -202,14 +193,7 @@
20+
@@ -203,14 +194,7 @@
2121
lint-fix:
2222
usage: Fix lint issues of back-end and front-end code.
2323
cmd: |

‎.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests/.ahoy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@@ -177,7 +177,6 @@
1+
@@ -178,7 +178,6 @@
22
cmd: |
33
ahoy lint-be
44
ahoy lint-fe
55
- ahoy lint-tests
66

77
lint-be:
88
usage: Lint back-end code.
9-
@@ -194,11 +193,6 @@
9+
@@ -195,11 +194,6 @@
1010
ahoy cli "yarn run lint"
1111
ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
1212

@@ -18,7 +18,7 @@
1818
lint-fix:
1919
usage: Fix lint issues of back-end and front-end code.
2020
cmd: |
21-
@@ -217,31 +211,6 @@
21+
@@ -218,31 +212,6 @@
2222
ahoy cli vendor/bin/twig-cs-fixer lint --fix
2323
ahoy cli "yarn run lint-fix"
2424
ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint-fix"

‎.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests_circleci/.ahoy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@@ -177,7 +177,6 @@
1+
@@ -178,7 +178,6 @@
22
cmd: |
33
ahoy lint-be
44
ahoy lint-fe
55
- ahoy lint-tests
66

77
lint-be:
88
usage: Lint back-end code.
9-
@@ -194,11 +193,6 @@
9+
@@ -195,11 +194,6 @@
1010
ahoy cli "yarn run lint"
1111
ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
1212

@@ -18,7 +18,7 @@
1818
lint-fix:
1919
usage: Fix lint issues of back-end and front-end code.
2020
cmd: |
21-
@@ -217,31 +211,6 @@
21+
@@ -218,31 +212,6 @@
2222
ahoy cli vendor/bin/twig-cs-fixer lint --fix
2323
ahoy cli "yarn run lint-fix"
2424
ahoy cli "yarn run --cwd=\${WEBROOT}/themes/custom/\${DRUPAL_THEME} lint-fix"

‎.vortex/installer/tests/Fixtures/install/tools_no_behat/.ahoy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@@ -177,7 +177,6 @@
1+
@@ -178,7 +178,6 @@
22
cmd: |
33
ahoy lint-be
44
ahoy lint-fe
55
- ahoy lint-tests
66

77
lint-be:
88
usage: Lint back-end code.
9-
@@ -197,8 +196,6 @@
9+
@@ -198,8 +197,6 @@
1010
lint-tests:
1111
usage: Lint tests code.
1212
cmd: |
@@ -15,15 +15,15 @@
1515
lint-fix:
1616
usage: Fix lint issues of back-end and front-end code.
1717
cmd: |
18-
@@ -224,7 +221,6 @@
18+
@@ -225,7 +222,6 @@
1919
ahoy test-unit
2020
ahoy test-kernel
2121
ahoy test-functional
2222
- ahoy test-bdd
2323

2424
test-unit:
2525
usage: Run PHPUnit unit tests.
26-
@@ -237,11 +233,6 @@
26+
@@ -238,11 +234,6 @@
2727
test-functional:
2828
usage: Run PHPUnit functional tests.
2929
cmd: ahoy cli vendor/bin/phpunit --testsuite=functional "$@"

0 commit comments

Comments
 (0)