Merge pull request #184 from devilbox/release-0.119

Release 0.119
devilbox · Dec 1, 2020 · e51d28f · e51d28f
2 parents 6616f33 + a002d3a
commit e51d28f
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 22 deletions.
diff --git a/.github/workflows/php-ci.yml b/.github/workflows/php-ci.yml
@@ -134,7 +134,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -143,6 +143,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Base
         run: |
@@ -153,7 +154,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -162,6 +163,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -176,7 +178,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -185,6 +187,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Mods
         run: |
@@ -195,7 +198,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -204,6 +207,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -218,7 +222,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -227,6 +231,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Prod
         run: |
@@ -237,7 +242,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -246,6 +251,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -260,7 +266,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -269,6 +275,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Work
         run: |
@@ -279,7 +286,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -288,6 +295,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -314,7 +322,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -349,6 +357,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
         # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
         if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
             && (

diff --git a/.github/workflows/php-nightly.yml b/.github/workflows/php-nightly.yml
@@ -138,7 +138,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -147,6 +147,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Base
         run: |
@@ -157,7 +158,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -166,6 +167,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -180,7 +182,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -189,6 +191,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Mods
         run: |
@@ -199,7 +202,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -208,6 +211,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -222,7 +226,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -231,6 +235,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Prod
         run: |
@@ -241,7 +246,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -250,6 +255,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -264,7 +270,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -273,6 +279,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
       - name: Test Work
         run: |
@@ -283,7 +290,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -292,6 +299,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
 
 
       # ------------------------------------------------------------
@@ -318,7 +326,7 @@ jobs:
                 echo "[SUCC] ${n}/${RETRIES}";
                 return 0;
               fi;
-              sleep 2;
+              sleep ${PAUSE};
               echo "[FAIL] ${n}/${RETRIES}";
             done;
             return 1;
@@ -353,6 +361,7 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
           RETRIES: 20
+          PAUSE: 10
         # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
         if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
             && (

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 ## Unreleased
 
 
+## Release 0.119
+
+#### Fixed
+- Fixed `drupal` (drupal console launcher) for PHP 5.5, 5.6, 7.0 and 7.1
+- Fixed `zsh` install for PHP 5.6 and 7.0
+
+
 ## Release 0.118
 
 #### Fixed

diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -211,7 +211,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\

diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -120,6 +120,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
+		zsh-common=5.3.1-4 \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
@@ -225,7 +226,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\

diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -120,6 +120,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
+		zsh-common=5.3.1-4 \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
@@ -225,7 +226,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\

diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -225,7 +225,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\

diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -140,6 +140,9 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
+{% if php_version in [5.6, 7.0] %}
+		zsh-common=5.3.1-4 \
+{% endif %}
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\

diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
@@ -518,6 +518,14 @@ software_available:
   drupalconsole:
     disabled: [5.2, 5.3, 5.4, 8.0, 8.1] # TODO: re-enable for 8.0 (currently errors)
     check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]'
+    5.5:
+      pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
+    5.6:
+      pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
+    7.0:
+      pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
+    7.1:
+      pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
     all:
       pre: DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')"
       command: curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal