Skip to content

Commit 65ebffd

Browse files
committed
feat: add testing for DDEV HEAD
1 parent 657b133 commit 65ebffd

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-24.04, ubuntu-24.04-arm]
22-
version: ['latest', '1.24.7']
22+
version: ['latest', 'head', '1.24.7']
2323
steps:
2424
- uses: actions/checkout@v5
2525
- uses: ./
@@ -37,11 +37,18 @@ jobs:
3737
- name: ddev stopped
3838
run: |
3939
cd tests/fixtures/ddevProj1
40-
test '"stopped"' = "$(ddev describe --json-output | jq '.raw.status')"
40+
describe_output="$(ddev describe -j 2>/dev/null | jq '.raw')"
41+
status="$(echo "$describe_output" | jq -r '.status')"
42+
echo "Expected: stopped"
43+
echo "Actual: ${status}"
44+
if [ "${status}" != "stopped" ]; then
45+
echo "$describe_output"
46+
fi
47+
test 'stopped' = "${status}"
4148
- name: start ddev
4249
run: |
4350
cd tests/fixtures/ddevProj1
44-
ddev start --json-output --skip-confirmation
51+
DDEV_DEBUG=true ddev start --skip-confirmation
4552
- name: Mailpit reachable
4653
run: curl --silent --dump-header - --output /dev/null https://setup-ddev-proj1.ddev.site:8026
4754
- name: "index.html: expected output"

action.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,26 @@ runs:
2929
- name: Download DDEV install script
3030
shell: bash
3131
run: |
32-
curl -fsSL --retry 3 --retry-max-time 60 --retry-connrefused \
33-
-o /tmp/install_ddev.sh \
34-
"${{ inputs.installScriptUrl }}"
32+
if [[ '${{ inputs.version }}' == 'head' && '${{ inputs.installScriptUrl }}' == 'https://ddev.com/install.sh' ]]; then
33+
SCRIPT_URL="https://raw.githubusercontent.com/ddev/ddev/main/scripts/install_ddev_head.sh"
34+
echo "Using head version install script: ${SCRIPT_URL}"
35+
else
36+
SCRIPT_URL="${{ inputs.installScriptUrl }}"
37+
fi
38+
curl -fsSL --retry 3 --retry-max-time 60 --retry-connrefused -o /tmp/install_ddev.sh "${SCRIPT_URL}"
3539
3640
- name: Install DDEV
3741
shell: bash
3842
run: |
39-
if [[ '${{ inputs.version }}' != 'latest' ]]; then
43+
if [[ '${{ inputs.version }}' == 'latest' ]]; then
44+
VERSION_ARG=""
45+
echo "Installing latest stable DDEV version"
46+
elif [[ '${{ inputs.version }}' == 'head' ]]; then
47+
VERSION_ARG=""
48+
echo "Installing DDEV HEAD version"
49+
else
4050
VERSION_ARG="v${{ inputs.version }}"
4151
echo "Installing DDEV version: ${VERSION_ARG}"
42-
else
43-
VERSION_ARG=""
44-
echo "Installing latest DDEV version"
4552
fi
4653
4754
# Make installation script executable

0 commit comments

Comments
 (0)