diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2021-04-28 11:12:21 +0100 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2021-04-28 11:12:21 +0100 |
| commit | 6acc0d9d674f065f8d4278b333ab924c42cbdd88 (patch) | |
| tree | 744c4dd4a984de48f245795232e05d52ca5c8dc8 | |
| parent | c828fb3b2988d2d8e9fe603608ee5c7be42daf3e (diff) | |
| download | org-drill-6acc0d9d674f065f8d4278b333ab924c42cbdd88.tar.gz org-drill-6acc0d9d674f065f8d4278b333ab924c42cbdd88.zip | |
Update docker images
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | test-by-cp | 4 | ||||
| -rw-r--r-- | 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 @@ -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 @@ -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 |