Skip to content

Commit e43d6c8

Browse files
authored
Control source registry of Lisp docker images (#103)
1 parent 3ba1300 commit e43d6c8

3 files changed

Lines changed: 38 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,43 @@ jobs:
1818
# The type of runner that the job will run on
1919
runs-on: ubuntu-latest
2020
container:
21-
image: containers.common-lisp.net/cl-docker-images/${{matrix.l}}:${{matrix.IMAGE_TAG}}
21+
image: ${{matrix.PREFIX}}/${{matrix.l}}:${{matrix.IMAGE_TAG}}
2222

2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
2626
# just going to try to get ONE lisp to work first
2727
# can't run CMUCL on GitHub actions.
2828
# ccl's ASDF seems to be having trouble with source initialization
29-
l: [abcl, allegro, clisp, ecl, sbcl] # ccl, cmucl (probably not the last).
29+
l: [abcl, allegro11express, clisp, ecl, ccl, sbcl] # ccl, cmucl (probably not the last).
3030
IMAGE_TAG: [latest]
31+
PREFIX:
32+
- containers.common-lisp.net/cl-docker-images
33+
- docker.io/rpgoldman
34+
exclude:
35+
- l: allegro11express
36+
PREFIX: containers.common-lisp.net/cl-docker-images
37+
- l: sbcl
38+
PREFIX: containers.common-lisp.net/cl-docker-images
39+
- l: ccl
40+
PREFIX: containers.common-lisp.net/cl-docker-images
41+
- l: abcl
42+
PREFIX: containers.common-lisp.net/cl-docker-images
43+
- l: clisp
44+
PREFIX: docker.io/rpgoldman
45+
- l: ecl
46+
PREFIX: docker.io/rpgoldman
3147
include:
3248
- l: clasp
3349
IMAGE_TAG: "b14e329f49998275579926da2a737885ceb2cea7"
34-
- l: allegro
50+
PREFIX: containers.common-lisp.net/cl-docker-images
51+
- l: allegro11express
3552
IMAGE_TAG: latest
3653
variant: modern
54+
PREFIX: docker.io/rpgoldman
3755
- l: abcl
3856
IMAGE_TAG: 1.7.1-jdk8 # FIXME: this is likely obsolete
39-
57+
PREFIX: containers.common-lisp.net/cl-docker-images
4058
env:
4159
GITHUB_ACTION: true
4260
I_AGREE_TO_ALLEGRO_EXPRESS_LICENSE: yes
@@ -65,16 +83,28 @@ jobs:
6583
6684
- name: test build
6785
shell: bash
86+
id: test-build
6887
run: |
6988
./run-tests.sh -c ${{ matrix.l }} || ${{ matrix.l == 'clisp' }}
7089
# no idea how to get FiveAM to build clean on clisp
90+
continue-on-error: true
7191

7292
- name: save build output
73-
uses: actions/upload-artifact@v3
93+
id: save-build-output
94+
uses: actions/upload-artifact@v4
7495
with:
7596
name: ${{matrix.l}}-${{matrix.IMAGE_TAG}}-build-output.text
7697
path: build/results/${{matrix.l}}-load.text
7798

99+
- name: return build output id
100+
run: |
101+
echo 'Artifact ID is ${{ steps.save-build-output.outputs.artifact-id }}'
102+
103+
- name: build fail
104+
if: ${{ steps.test-build.outcome == 'failure'}}
105+
run:
106+
/usr/bin/false
107+
78108
- name: tests
79109
shell: bash
80110
run: |

build.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
(error #'(lambda (x)
5858
(setf *build-error* x)
5959
(throw 'build-failed t))))
60-
(asdf:load-system "fiveam" :force :all)))
60+
(asdf:load-system "fiveam" :force t)))
6161

6262
(cond
6363
(*build-error*

run-tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ usage () {
1616
echo " allegro_s, allegro8_s, allegromodern_s, allegromodern8_s (SMP variants)"
1717
echo " allegro_64, allegro8_64, allegromodern_64, allegromodern8_64 (64-bit variants),"
1818
echo " allegro_64_s, allegro8_64_s, allegromodern_64_s, allegromodern8_64_s, (SMP, 64-bit variants)"
19+
echo " allegro11express (for docker image)"
1920
echo " clasp, clisp, cmucl, ecl, gcl, sbcl, scl and xcl."
2021
echo " To configure the script, you may set environment variables to point to the various lisp runtimes."
2122
echo " Allegro CL is a special case: instead of setting environment variables for the specific runtime"
@@ -152,6 +153,7 @@ case "$lisp" in
152153
;;
153154
allegro*)
154155
case "$lisp" in
156+
allegro11express) command="${ALLEGRO:-alisp}" ;;
155157
allegro) command="${ALLEGRO:-alisp}" ;;
156158
allegro8) command="${ALLEGRO8:-alisp8}" ;;
157159
allegromodern) command="${ALLEGROMODERN:-mlisp}" ;;

0 commit comments

Comments
 (0)