ci(*): Update action to handle new ddev add-on behavior

crowdsecurity · Mar 17, 2023 · 5bbd543 · 5bbd543
1 parent ebd23be
commit 5bbd543
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/.github/workflows/end-to-end-auto-prepend-test-suite.yml b/.github/workflows/end-to-end-auto-prepend-test-suite.yml
@@ -53,13 +53,8 @@ jobs:
           # override redis.conf
           ddev get julienloizelet/ddev-tools
 
-      - name: Add Crowdsec and Playwright
-        run: |
-          ddev get julienloizelet/ddev-crowdsec-php
-          ddev get julienloizelet/ddev-playwright
-          cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
-          cp .ddev/okaeli-add-on/magento2/commands/host/crowdsec-config .ddev/commands/host/
-          ddev restart
+      - name: Add Playwright
+        run: ddev get julienloizelet/ddev-playwright
 
       - name: Clone M2 ${{ env.EXTENSION_NAME }} files
         uses: actions/checkout@v3
@@ -101,11 +96,13 @@ jobs:
           ddev magento module:enable ${{ env.EXTENSION_NAME }}
           ddev magento setup:upgrade
           ddev magento setup:static-content:deploy -f
-          ddev crowdsec-config
           ddev magento cache:flush
+          ddev get julienloizelet/ddev-crowdsec-php
+          ddev restart
 
       - name: Prepare for playwright test
         run: |
+          cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
           ddev magento setup:performance:generate-fixtures ./varnish-profile.xml
           ddev magento cache:flush
           mkdir -p var/crowdsec/tls

diff --git a/.github/workflows/end-to-end-test-suite.yml b/.github/workflows/end-to-end-test-suite.yml
@@ -58,13 +58,8 @@ jobs:
           # override redis.conf
           ddev get julienloizelet/ddev-tools
 
-      - name: Add Crowdsec and Playwright
-        run: |
-          ddev get julienloizelet/ddev-crowdsec-php
-          ddev get julienloizelet/ddev-playwright
-          cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
-          cp .ddev/okaeli-add-on/magento2/commands/host/crowdsec-config .ddev/commands/host/
-          ddev restart
+      - name: Playwright
+        run: ddev get julienloizelet/ddev-playwright
 
       - name: Clone M2 ${{ env.EXTENSION_NAME }} files
         uses: actions/checkout@v3
@@ -107,11 +102,13 @@ jobs:
           ddev magento module:enable ${{ env.EXTENSION_NAME }}
           ddev magento setup:upgrade
           ddev magento setup:static-content:deploy -f
-          ddev crowdsec-config
           ddev magento cache:flush
+          ddev get julienloizelet/ddev-crowdsec-php
+          ddev restart
 
       - name: Prepare for playwright test
         run: |
+          cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
           ddev magento setup:performance:generate-fixtures ./varnish-profile.xml
           ddev magento cache:flush
           mkdir -p var/crowdsec/tls

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -176,13 +176,8 @@ jobs:
             # override redis.conf
             ddev get julienloizelet/ddev-tools
 
-        - name: Add Crowdsec and Playwright
-          run: |
-            ddev get julienloizelet/ddev-crowdsec-php
-            ddev get julienloizelet/ddev-playwright
-            cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
-            cp .ddev/okaeli-add-on/magento2/commands/host/crowdsec-config .ddev/commands/host/
-            ddev restart
+        - name: Playwright
+          run: ddev get julienloizelet/ddev-playwright
 
         - name: Clone M2 ${{ env.EXTENSION_NAME }} files
           uses: actions/checkout@v3
@@ -236,11 +231,13 @@ jobs:
             ddev magento module:enable ${{ env.EXTENSION_NAME }}
             ddev magento setup:upgrade
             ddev magento setup:static-content:deploy -f
-            ddev crowdsec-config
             ddev magento cache:flush
+            ddev get julienloizelet/ddev-crowdsec-php
+            ddev restart
 
         - name: Prepare for playwright test
           run: |
+            cp .ddev/okaeli-add-on/magento2/custom_files/varnish-profile.xml varnish-profile.xml
             ddev magento setup:performance:generate-fixtures ./varnish-profile.xml
             ddev magento cache:flush
             mkdir -p var/crowdsec/tls

diff --git a/doc/DEVELOPER.md b/doc/DEVELOPER.md
@@ -82,9 +82,6 @@ ddev get ddev/ddev-memcached
 ddev get ddev/ddev-elasticsearch
 ddev get julienloizelet/ddev-tools
 ddev get julienloizelet/ddev-playwright
-ddev get julienloizelet/ddev-crowdsec-php
-cp .ddev/okaeli-add-on/config_overrides/crowdsec/config.crowdsec.yaml .ddev/config.crowdsec.yaml 
-cp .ddev/okaeli-add-on/magento2/commands/host/crowdsec-config .ddev/commands/host/
 ddev start
 ```
 
@@ -143,6 +140,8 @@ ddev magento c:c
  ddev magento module:enable CrowdSec_Bouncer
  ddev magento setup:upgrade
  ddev magento cache:flush
+ ddev get julienloizelet/ddev-crowdsec-php
+ ddev restart
 ```
 
 ### Extension quality