From 6acc0d9d674f065f8d4278b333ab924c42cbdd88 Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Wed, 28 Apr 2021 11:12:21 +0100
Subject: Update docker images

---
 .gitlab-ci.yml | 3 ++-
 Makefile       | 8 ++++----
 test-by-cp     | 4 ++++
 test-from-git  | 7 ++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0214174..94d4468 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,4 +2,5 @@ image: "silex/emacs:27.2-dev"
 
 test:
   script:
-    - make test
+    - git clone https://github.com/cask/cask ~/.cask
+    - PATH=$HOME/.cask/bin:$PATH make test
diff --git a/Makefile b/Makefile
index 4a8b4ad..f70f3a2 100644
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,10 @@ test-git:
 	docker run -it --rm --name docker-git -v $(PWD):/usr/src/app -w /usr/src/app --entrypoint=/bin/bash  silex/emacs:$(DOCKER_TAG)-dev ./test-from-git
 
 docker-test:
-	$(MAKE) test-git DOCKER_TAG=26.2
-	$(MAKE) test-cp DOCKER_TAG=26.2
-	$(MAKE) test-git DOCKER_TAG=25.3
-	$(MAKE) test-cp DOCKER_TAG=25.3
+	$(MAKE) test-git DOCKER_TAG=27.2
+	$(MAKE) test-cp DOCKER_TAG=27.2
+	$(MAKE) test-git DOCKER_TAG=26.3
+	$(MAKE) test-cp DOCKER_TAG=26.3
 
 clean-elc:
 	$(CASK) clean-elc
diff --git a/test-by-cp b/test-by-cp
index 9b73f56..76dbf83 100644
--- a/test-by-cp
+++ b/test-by-cp
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+git clone https://github.com/cask/cask ~/.cask
+export PATH=$HOME/.cask/bin:$PATH
+
+
 cd ..
 mkdir copy
 cd copy
diff --git a/test-from-git b/test-from-git
index 681f81e..2159408 100644
--- a/test-from-git
+++ b/test-from-git
@@ -1,7 +1,12 @@
 #!/bin/sh
 
+git clone https://github.com/cask/cask ~/.cask
+export PATH=$HOME/.cask/bin:$PATH
+
 cd ..
 mkdir git
 cd git
 git clone ../app .
-make test
\ No newline at end of file
+
+
+make test
-- 
cgit v1.2.3