From 5c438cb44dd0a383be2a6115b676763bea8b9a65 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Sun, 6 Dec 2020 15:04:13 +0000
Subject: [PATCH] Avoid using niden/actions-memcached (#35499)

---
 .github/workflows/tests.yml | 7 ++++---
 docker-compose.yml          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f64afb62a99a..d2a186904407 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,6 +11,10 @@ jobs:
     runs-on: ubuntu-latest
 
     services:
+      memcached:
+        image: memcached:1.6-alpine
+        ports:
+          - 11211:11211
       mysql:
         image: mysql:5.7
         env:
@@ -44,9 +48,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Setup Memcached
-        uses: niden/actions-memcached@v7
-
       - name: Setup problem matchers
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dc02296a48b4..4b129f911cfc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   memcached:
-    image: memcached:1.5-alpine
+    image: memcached:1.6-alpine
     ports:
       - "11211:11211"
     restart: always