Upcoming ddev release requires #ddev-generated in files or get can't …

…overwrite (#4)

Minor other changes, #ddev-nodisplay added to the arch check

Signed-off-by: Randy Fay <[email protected]>

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: tests
 on:
   pull_request:
   push:
-    branches: [ master, main ]
+    branches: [ main ]
 
   schedule:
   - cron: '01 07 * * *'
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        ddev_version: [stable, edge, HEAD]
+        ddev_version: [stable, HEAD]
 #        ddev_version: [PR]
       fail-fast: false
 

commands/cypress/cypress-open

@@ -1,4 +1,5 @@
 #!/bin/bash
+#ddev-generated
 
 ## Description: Open an interactive Cypress window
 ##              https://docs.cypress.io/guides/guides/command-line#cypress-open

commands/cypress/cypress-run

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#ddev-generated
 ## Description: Use Cypress in "runner" mode.
 ##
 ## Usage: cypress-run [arguments]

docker-compose.cypress.yaml

@@ -1,3 +1,4 @@
+#ddev-generated
 version: '3.6'
 services:
   cypress:

install.yaml

@@ -4,12 +4,18 @@ name: addon-template
 # Examples would be removing an extraneous docker volume,
 # or doing a sanity check for requirements.
 pre_install_actions:
-- 'if [ "$(arch)" = "arm64" -o "$(arch)" = "aarch64" ]; then echo "This package does not work on arm64 machines"; exit 1; fi'
+- |
+  #ddev-nodisplay
+  if [ "$(arch)" = "arm64" -o "$(arch)" = "aarch64" ]; then 
+    echo "This package does not work on arm64 machines"; 
+    exit 1; 
+  fi
 
 # list of files and directories listed that are copied into project .ddev directory
 project_files:
 - docker-compose.cypress.yaml
-- commands/cypress/
+- commands/cypress/cypress-open
+- commands/cypress/cypress-run
 
 # List of files and directories that are copied into the global .ddev directory
 global_files: