Skip to content

Commit e51d28f

Browse files
cytopiacytopia
authored
Merge pull request #184 from devilbox/release-0.119
Release 0.119
2 parents 6616f33 + a002d3a commit e51d28f

File tree

9 files changed

+60
-22
lines changed

9 files changed

+60
-22
lines changed

‎.github/workflows/php-ci.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
echo "[SUCC] ${n}/${RETRIES}";
135135
return 0;
136136
fi;
137-
sleep 2;
137+
sleep ${PAUSE};
138138
echo "[FAIL] ${n}/${RETRIES}";
139139
done;
140140
return 1;
@@ -143,6 +143,7 @@ jobs:
143143
env:
144144
VERSION: ${{ matrix.version }}
145145
RETRIES: 20
146+
PAUSE: 10
146147

147148
- name: Test Base
148149
run: |
@@ -153,7 +154,7 @@ jobs:
153154
echo "[SUCC] ${n}/${RETRIES}";
154155
return 0;
155156
fi;
156-
sleep 2;
157+
sleep ${PAUSE};
157158
echo "[FAIL] ${n}/${RETRIES}";
158159
done;
159160
return 1;
@@ -162,6 +163,7 @@ jobs:
162163
env:
163164
VERSION: ${{ matrix.version }}
164165
RETRIES: 20
166+
PAUSE: 10
165167

166168

167169
# ------------------------------------------------------------
@@ -176,7 +178,7 @@ jobs:
176178
echo "[SUCC] ${n}/${RETRIES}";
177179
return 0;
178180
fi;
179-
sleep 2;
181+
sleep ${PAUSE};
180182
echo "[FAIL] ${n}/${RETRIES}";
181183
done;
182184
return 1;
@@ -185,6 +187,7 @@ jobs:
185187
env:
186188
VERSION: ${{ matrix.version }}
187189
RETRIES: 20
190+
PAUSE: 10
188191

189192
- name: Test Mods
190193
run: |
@@ -195,7 +198,7 @@ jobs:
195198
echo "[SUCC] ${n}/${RETRIES}";
196199
return 0;
197200
fi;
198-
sleep 2;
201+
sleep ${PAUSE};
199202
echo "[FAIL] ${n}/${RETRIES}";
200203
done;
201204
return 1;
@@ -204,6 +207,7 @@ jobs:
204207
env:
205208
VERSION: ${{ matrix.version }}
206209
RETRIES: 20
210+
PAUSE: 10
207211

208212

209213
# ------------------------------------------------------------
@@ -218,7 +222,7 @@ jobs:
218222
echo "[SUCC] ${n}/${RETRIES}";
219223
return 0;
220224
fi;
221-
sleep 2;
225+
sleep ${PAUSE};
222226
echo "[FAIL] ${n}/${RETRIES}";
223227
done;
224228
return 1;
@@ -227,6 +231,7 @@ jobs:
227231
env:
228232
VERSION: ${{ matrix.version }}
229233
RETRIES: 20
234+
PAUSE: 10
230235

231236
- name: Test Prod
232237
run: |
@@ -237,7 +242,7 @@ jobs:
237242
echo "[SUCC] ${n}/${RETRIES}";
238243
return 0;
239244
fi;
240-
sleep 2;
245+
sleep ${PAUSE};
241246
echo "[FAIL] ${n}/${RETRIES}";
242247
done;
243248
return 1;
@@ -246,6 +251,7 @@ jobs:
246251
env:
247252
VERSION: ${{ matrix.version }}
248253
RETRIES: 20
254+
PAUSE: 10
249255

250256

251257
# ------------------------------------------------------------
@@ -260,7 +266,7 @@ jobs:
260266
echo "[SUCC] ${n}/${RETRIES}";
261267
return 0;
262268
fi;
263-
sleep 2;
269+
sleep ${PAUSE};
264270
echo "[FAIL] ${n}/${RETRIES}";
265271
done;
266272
return 1;
@@ -269,6 +275,7 @@ jobs:
269275
env:
270276
VERSION: ${{ matrix.version }}
271277
RETRIES: 20
278+
PAUSE: 10
272279

273280
- name: Test Work
274281
run: |
@@ -279,7 +286,7 @@ jobs:
279286
echo "[SUCC] ${n}/${RETRIES}";
280287
return 0;
281288
fi;
282-
sleep 2;
289+
sleep ${PAUSE};
283290
echo "[FAIL] ${n}/${RETRIES}";
284291
done;
285292
return 1;
@@ -288,6 +295,7 @@ jobs:
288295
env:
289296
VERSION: ${{ matrix.version }}
290297
RETRIES: 20
298+
PAUSE: 10
291299

292300

293301
# ------------------------------------------------------------
@@ -314,7 +322,7 @@ jobs:
314322
echo "[SUCC] ${n}/${RETRIES}";
315323
return 0;
316324
fi;
317-
sleep 2;
325+
sleep ${PAUSE};
318326
echo "[FAIL] ${n}/${RETRIES}";
319327
done;
320328
return 1;
@@ -349,6 +357,7 @@ jobs:
349357
env:
350358
VERSION: ${{ matrix.version }}
351359
RETRIES: 20
360+
PAUSE: 10
352361
# https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
353362
if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
354363
&& (

‎.github/workflows/php-nightly.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
echo "[SUCC] ${n}/${RETRIES}";
139139
return 0;
140140
fi;
141-
sleep 2;
141+
sleep ${PAUSE};
142142
echo "[FAIL] ${n}/${RETRIES}";
143143
done;
144144
return 1;
@@ -147,6 +147,7 @@ jobs:
147147
env:
148148
VERSION: ${{ matrix.version }}
149149
RETRIES: 20
150+
PAUSE: 10
150151

151152
- name: Test Base
152153
run: |
@@ -157,7 +158,7 @@ jobs:
157158
echo "[SUCC] ${n}/${RETRIES}";
158159
return 0;
159160
fi;
160-
sleep 2;
161+
sleep ${PAUSE};
161162
echo "[FAIL] ${n}/${RETRIES}";
162163
done;
163164
return 1;
@@ -166,6 +167,7 @@ jobs:
166167
env:
167168
VERSION: ${{ matrix.version }}
168169
RETRIES: 20
170+
PAUSE: 10
169171

170172

171173
# ------------------------------------------------------------
@@ -180,7 +182,7 @@ jobs:
180182
echo "[SUCC] ${n}/${RETRIES}";
181183
return 0;
182184
fi;
183-
sleep 2;
185+
sleep ${PAUSE};
184186
echo "[FAIL] ${n}/${RETRIES}";
185187
done;
186188
return 1;
@@ -189,6 +191,7 @@ jobs:
189191
env:
190192
VERSION: ${{ matrix.version }}
191193
RETRIES: 20
194+
PAUSE: 10
192195

193196
- name: Test Mods
194197
run: |
@@ -199,7 +202,7 @@ jobs:
199202
echo "[SUCC] ${n}/${RETRIES}";
200203
return 0;
201204
fi;
202-
sleep 2;
205+
sleep ${PAUSE};
203206
echo "[FAIL] ${n}/${RETRIES}";
204207
done;
205208
return 1;
@@ -208,6 +211,7 @@ jobs:
208211
env:
209212
VERSION: ${{ matrix.version }}
210213
RETRIES: 20
214+
PAUSE: 10
211215

212216

213217
# ------------------------------------------------------------
@@ -222,7 +226,7 @@ jobs:
222226
echo "[SUCC] ${n}/${RETRIES}";
223227
return 0;
224228
fi;
225-
sleep 2;
229+
sleep ${PAUSE};
226230
echo "[FAIL] ${n}/${RETRIES}";
227231
done;
228232
return 1;
@@ -231,6 +235,7 @@ jobs:
231235
env:
232236
VERSION: ${{ matrix.version }}
233237
RETRIES: 20
238+
PAUSE: 10
234239

235240
- name: Test Prod
236241
run: |
@@ -241,7 +246,7 @@ jobs:
241246
echo "[SUCC] ${n}/${RETRIES}";
242247
return 0;
243248
fi;
244-
sleep 2;
249+
sleep ${PAUSE};
245250
echo "[FAIL] ${n}/${RETRIES}";
246251
done;
247252
return 1;
@@ -250,6 +255,7 @@ jobs:
250255
env:
251256
VERSION: ${{ matrix.version }}
252257
RETRIES: 20
258+
PAUSE: 10
253259

254260

255261
# ------------------------------------------------------------
@@ -264,7 +270,7 @@ jobs:
264270
echo "[SUCC] ${n}/${RETRIES}";
265271
return 0;
266272
fi;
267-
sleep 2;
273+
sleep ${PAUSE};
268274
echo "[FAIL] ${n}/${RETRIES}";
269275
done;
270276
return 1;
@@ -273,6 +279,7 @@ jobs:
273279
env:
274280
VERSION: ${{ matrix.version }}
275281
RETRIES: 20
282+
PAUSE: 10
276283

277284
- name: Test Work
278285
run: |
@@ -283,7 +290,7 @@ jobs:
283290
echo "[SUCC] ${n}/${RETRIES}";
284291
return 0;
285292
fi;
286-
sleep 2;
293+
sleep ${PAUSE};
287294
echo "[FAIL] ${n}/${RETRIES}";
288295
done;
289296
return 1;
@@ -292,6 +299,7 @@ jobs:
292299
env:
293300
VERSION: ${{ matrix.version }}
294301
RETRIES: 20
302+
PAUSE: 10
295303

296304

297305
# ------------------------------------------------------------
@@ -318,7 +326,7 @@ jobs:
318326
echo "[SUCC] ${n}/${RETRIES}";
319327
return 0;
320328
fi;
321-
sleep 2;
329+
sleep ${PAUSE};
322330
echo "[FAIL] ${n}/${RETRIES}";
323331
done;
324332
return 1;
@@ -353,6 +361,7 @@ jobs:
353361
env:
354362
VERSION: ${{ matrix.version }}
355363
RETRIES: 20
364+
PAUSE: 10
356365
# https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
357366
if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
358367
&& (

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
## Unreleased
55

66

7+
## Release 0.119
8+
9+
#### Fixed
10+
- Fixed `drupal` (drupal console launcher) for PHP 5.5, 5.6, 7.0 and 7.1
11+
- Fixed `zsh` install for PHP 5.6 and 7.0
12+
13+
714
## Release 0.118
815

916
#### Fixed

‎Dockerfiles/work/Dockerfile-5.5

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ RUN set -eux \
211211
\
212212
\
213213
# -------------------- drupalconsole --------------------
214-
&& 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')" \
214+
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
215215
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
216216
&& chmod +x /usr/local/bin/drupal \
217217
\

‎Dockerfiles/work/Dockerfile-5.6

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ RUN set -eux \
120120
zip \
121121
zlib1g-dev \
122122
zsh \
123+
zsh-common=5.3.1-4 \
123124
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
124125
&& rm -rf /var/lib/apt/lists/* \
125126
\
@@ -225,7 +226,7 @@ RUN set -eux \
225226
\
226227
\
227228
# -------------------- drupalconsole --------------------
228-
&& 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')" \
229+
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
229230
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
230231
&& chmod +x /usr/local/bin/drupal \
231232
\

‎Dockerfiles/work/Dockerfile-7.0

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ RUN set -eux \
120120
zip \
121121
zlib1g-dev \
122122
zsh \
123+
zsh-common=5.3.1-4 \
123124
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
124125
&& rm -rf /var/lib/apt/lists/* \
125126
\
@@ -225,7 +226,7 @@ RUN set -eux \
225226
\
226227
\
227228
# -------------------- drupalconsole --------------------
228-
&& 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')" \
229+
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
229230
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
230231
&& chmod +x /usr/local/bin/drupal \
231232
\

‎Dockerfiles/work/Dockerfile-7.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ RUN set -eux \
225225
\
226226
\
227227
# -------------------- drupalconsole --------------------
228-
&& 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')" \
228+
&& DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \
229229
&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
230230
&& chmod +x /usr/local/bin/drupal \
231231
\

‎build/ansible/DOCKERFILES/Dockerfile-work.j2

+3
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ RUN set -eux \
140140
zip \
141141
zlib1g-dev \
142142
zsh \
143+
{% if php_version in [5.6, 7.0] %}
144+
zsh-common=5.3.1-4 \
145+
{% endif %}
143146
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
144147
&& rm -rf /var/lib/apt/lists/* \
145148
\

‎build/ansible/group_vars/all/work.yml

+8
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,14 @@ software_available:
518518
drupalconsole:
519519
disabled: [5.2, 5.3, 5.4, 8.0, 8.1] # TODO: re-enable for 8.0 (currently errors)
520520
check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]'
521+
5.5:
522+
pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
523+
5.6:
524+
pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
525+
7.0:
526+
pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
527+
7.1:
528+
pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
521529
all:
522530
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')"
523531
command: curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal

0 commit comments

Comments
 (0)