Skip to content

Commit

Permalink
Use redis:6-bullseye to support old systems, update GitHub test workf…
Browse files Browse the repository at this point in the history
…low (#17)

Co-authored-by: Randy Fay <[email protected]>
  • Loading branch information
stasadev and rfay committed Aug 2, 2023
1 parent 5bcb6fd commit d5b0980
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ permissions:

env:
NIGHTLY_DDEV_PR_URL: "https://nightly.link/ddev/ddev/actions/runs/1720215802/ddev-linux-amd64.zip"
# Allow ddev get to use a github token to prevent rate limiting by tests
# Allow ddev get to use a GitHub token to prevent rate limiting by tests
DDEV_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Allow `--HEAD` flag when running tests against HEAD
HOMEBREW_NO_INSTALL_FROM_API: 1
# Pull the same image as in docker-compose.redis.yaml
REDIS_IMAGE: redis:6-bullseye
jobs:
tests:
defaults:
Expand All @@ -40,10 +40,10 @@ jobs:
# ddev_version: [PR]
fail-fast: false

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Download docker images
run: |
mkdir junk && pushd junk && ddev config --auto && ddev debug download-images >/dev/null
docker pull redis:6 >/dev/null
docker pull ${REDIS_IMAGE} >/dev/null
- name: tmate debugging session
uses: mxschmitt/action-tmate@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
services:
redis:
container_name: ddev-${DDEV_SITENAME}-redis
image: redis:6
image: redis:6-bullseye
# These labels ensure this service is discoverable by ddev.
labels:
com.ddev.site-name: ${DDEV_SITENAME}
Expand Down

0 comments on commit d5b0980

Please sign in to comment.