Skip to content

Commit e7fa609

Browse files
authored
chore(*): run update-checker.sh, version constraint v1.24.10 (#49)
1 parent aef5e18 commit e7fa609

5 files changed

Lines changed: 27 additions & 11 deletions

File tree

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Exclude files from releases/tarballs
2+
tests/ export-ignore
3+
.github/ export-ignore
4+
.gitattributes export-ignore

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1+
12
## The Issue
23

3-
- #<issue number>
4+
- Fixes #REPLACE_ME_WITH_RELATED_ISSUE_NUMBER
45

56
<!-- Provide a brief description of the issue. -->
67

78
## How This PR Solves The Issue
89

10+
<!-- Describe the key change(s) in this PR that address the issue above. -->
11+
912
## Manual Testing Instructions
1013

14+
<!-- If this PR changes logic, consider adding additional steps or context to the instructions below. -->
15+
1116
```bash
12-
ddev add-on get https://github.com/<user>/<repo>/tarball/<branch>
17+
ddev add-on get https://github.com/ddev/ddev-adminer/tarball/refs/pull/REPLACE_ME_WITH_THIS_PR_NUMBER/head
1318
ddev restart
1419
```
1520

.github/workflows/tests.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
name: tests
22
on:
33
pull_request:
4+
paths-ignore:
5+
- "**.md"
46
push:
57
branches: [ main ]
8+
paths-ignore:
9+
- "**.md"
610

711
schedule:
8-
- cron: '25 08 * * *'
12+
- cron: '25 08 * * *'
913

1014
workflow_dispatch:
1115
inputs:
@@ -19,9 +23,8 @@ concurrency:
1923
group: ${{ github.workflow }}-${{ github.ref }}
2024
cancel-in-progress: true
2125

22-
# This is required for "gautamkrishnar/keepalive-workflow", see "ddev/github-action-add-on-test"
2326
permissions:
24-
actions: write
27+
contents: read
2528

2629
jobs:
2730
tests:

install.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ project_files:
77

88
pre_install_actions:
99
- |
10-
#ddev-nodisplay
1110
#ddev-description:Removing old adminer files
1211
has_old_files=false
1312
for file in "${DDEV_APPROOT}/.ddev/adminer/Dockerfile" "${DDEV_APPROOT}/.ddev/adminer/ddev-login.php"; do
@@ -25,14 +24,13 @@ pre_install_actions:
2524
exit 2
2625
fi
2726
- |
28-
#ddev-nodisplay
2927
#ddev-description:Check for db service
30-
if ddev debug configyaml 2>/dev/null | grep omit_containers | grep -q db; then
28+
if ddev utility configyaml 2>/dev/null | grep omit_containers | grep -q db; then
3129
echo "Unable to install the add-on because no db service was found"
3230
exit 3
3331
fi
3432
35-
ddev_version_constraint: '>= v1.24.3'
33+
ddev_version_constraint: '>= v1.24.10'
3634

3735
post_install_actions:
3836
- |

tests/test.bats

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,14 @@ health_checks() {
5353

5454
teardown() {
5555
set -eu -o pipefail
56-
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1
57-
[ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
56+
ddev delete -Oy "${PROJNAME}" >/dev/null 2>&1
57+
# Persist TESTDIR if running inside GitHub Actions. Useful for uploading test result artifacts
58+
# See example at https://github.com/ddev/github-action-add-on-test#preserving-artifacts
59+
if [ -n "${GITHUB_ENV:-}" ]; then
60+
[ -e "${GITHUB_ENV:-}" ] && echo "TESTDIR=${HOME}/tmp/${PROJNAME}" >> "${GITHUB_ENV}"
61+
else
62+
[ "${TESTDIR}" != "" ] && rm -rf "${TESTDIR}"
63+
fi
5864
}
5965

6066
@test "install from directory" {

0 commit comments

Comments
 (0)