emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/org-drill bf8fe812d4 251/251: Update docker images


From: ELPA Syncer
Subject: [nongnu] elpa/org-drill bf8fe812d4 251/251: Update docker images
Date: Mon, 17 Jan 2022 18:59:23 -0500 (EST)

branch: elpa/org-drill
commit bf8fe812d44a3ce3e84361fb39b8ef28ca10fd0c
Author: Phillip Lord <phillip.lord@russet.org.uk>
Commit: Phillip Lord <phillip.lord@russet.org.uk>

    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 02141746d5..94d4468f35 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 4a8b4ad858..f70f3a267f 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 9b73f56ed7..76dbf832f2 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 681f81eb31..2159408f9d 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]