Merge branch 'master' into rust-merge-eval

.github/workflows/main.yml

@@ -26,9 +26,9 @@ jobs:
       - uses: actions/checkout@v4
       - id: files
         if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: kanaka/get-changed-files@v2
+        uses: kanaka/get-changed-files@v3
         with:
-          default_base: master
+          default-base: master
       - id: get-matrix-step
         run: |
           export OVERRIDE_IMPLS="${{ github.event.inputs.impls }}" # "

ci.sh

@@ -73,11 +73,11 @@ case "${ACTION}" in
 docker-build-push)
     if ! docker pull ${IMAGE}; then
         step_summary "${MAL_IMPL:-${IMPL}} - building ${IMAGE}"
-        make "docker-build^${MAL_IMPL:-${IMPL}}"
-        step_summary "${MAL_IMPL:-${IMPL}} - built ${IMAGE}"
+        make "docker-build^${BUILD_IMPL}"
+        step_summary "${BUILD_IMPL}} - built ${IMAGE}"
         if [ "${GITHUB_REF}" = "refs/heads/main" ]; then
             docker push ${IMAGE}
-            step_summary "${MAL_IMPL:-${IMPL}} - pushed ${IMAGE}"
+            step_summary "${BUILD_IMPL} - pushed ${IMAGE}"
         fi
     fi
     ;;

impls/ada.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -22,4 +20,4 @@ WORKDIR /mal
 ##########################################################
 
 # GNU Ada compiler
-RUN apt-get -y install gnat-8
+RUN apt-get -y install gnat libreadline-dev

impls/ada/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 LABEL org.opencontainers.image.source=https://github.com/kanaka/mal
 LABEL org.opencontainers.image.description="mal test container: ada"
@@ -11,10 +11,8 @@ LABEL org.opencontainers.image.description="mal test container: ada"
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -24,4 +22,4 @@ WORKDIR /mal
 ##########################################################
 
 # GNU Ada compiler
-RUN apt-get -y install gnat-4.9
+RUN apt-get -y install gnat

impls/awk/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/bash/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/bbc-basic/Dockerfile

@@ -1,4 +1,5 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
+MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
 # General requirements for testing or common across many
@@ -8,10 +9,8 @@ FROM ubuntu:18.04
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -20,12 +19,4 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# These may be necessary for some base Ubuntu containers.
-# RUN sed 's/^deb/deb-src/' \
-#     < /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-# RUN apt-get update
-
-RUN apt-get build-dep -y brandy
-RUN cd /tmp && apt-get source brandy && cd brandy-* && \
-    make -f makefile.text && cp sbrandy /usr/bin/sbrandy && \
-    cd /tmp && rm -rf brandy*
+RUN apt-get -y install brandy

impls/clojure/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,15 +19,13 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+RUN apt-get -y install curl libreadline-dev libedit-dev
+
 #
 # Clojure (Java and lein)
 #
 
-RUN apt-get -y install openjdk-8-jdk
-
-ADD https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein \
-    /usr/local/bin/lein
-RUN chmod 0755 /usr/local/bin/lein
+RUN apt-get -y install leiningen
 ENV LEIN_HOME /mal/.lein
 ENV LEIN_JVM_OPTS -Duser.home=/mal
 
@@ -53,4 +49,3 @@ ENV NPM_CONFIG_CACHE /mal/.npm
 #RUN npm install -g ffi lumo-cljs
 
 ENV HOME=/mal
-

impls/coffee/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,19 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# For building node modules
-RUN apt-get -y install g++
-
-# Add nodesource apt repo config for 10.x stable
-RUN apt-get -y install gnupg
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-
-# Install nodejs
-RUN apt-get -y install nodejs
-
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install coffeescript
 ENV NPM_CONFIG_CACHE /mal/.npm
-
-# CoffeeScript specific
-RUN npm install -g coffeescript
 RUN touch /.coffee_history && chmod go+w /.coffee_history
-

impls/coffee/package.json

@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in CoffeeScript",
     "dependencies": {
-        "ffi-napi": "2.4.x",
+        "ffi-napi": "4.0.3",
         "coffeescript": "~1.8"
     }
 }

impls/common-lisp/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,8 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# Install git, make
-RUN apt-get -y install git make
+RUN apt-get -y install curl git libreadline-dev libedit-dev
 
 # Install sbcl
 RUN apt-get -y install sbcl

impls/cpp/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -22,4 +20,4 @@ WORKDIR /mal
 ##########################################################
 
 # Install g++ for any C/C++ based implementations
-RUN apt-get -y install g++
+RUN apt-get -y install g++ libreadline-dev

impls/cpp/Makefile

@@ -1,14 +1,11 @@
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 
+CXX=g++
 ifeq ($(uname_S),Darwin)
 	# Native build on yosemite. Requires: brew install readline
-	CXX=g++
 	READLINE=/usr/local/opt/readline
 	INCPATHS=-I$(READLINE)/include
 	LIBPATHS=-L$(READLINE)/lib
-else
-	# Ubuntu 14.10 / docker
-	CXX=g++-4.9
 endif
 
 LD=$(CXX)

impls/cs/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal

impls/elisp/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:wily
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,6 +19,4 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# Emacs 24
-RUN apt-get -y install emacs24-nox
-
+RUN apt-get -y install emacs-nox

impls/elixir/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -fs /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -22,9 +20,4 @@ WORKDIR /mal
 ##########################################################
 
 # Elixir
-RUN apt-get install -y wget
-RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
-RUN dpkg -i erlang-solutions_1.0_all.deb
-RUN apt-get update -y
-RUN apt-get install -y esl-erlang
 RUN apt-get install -y elixir

impls/elm/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "bootstrap.js",
   "dependencies": {
-    "ffi-napi": "2.4.x"
+    "ffi-napi": "4.0.3"
   },
   "devDependencies": {
     "elm": "^0.18.0"