Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add job to build CIEL for Void Linux x86_64 glibc #30

Merged
merged 5 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 62 additions & 27 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,68 @@
image: clfoundation/sbcl

# We need to install some system dependencies,
# to clone libraries not in Quicklisp,
# and to update ASDF to >= 3.3.5 in order to use local-package-nicknames.
before_script:
- apt-get update -qy
- apt-get install -y git-core tar

# The image doesn't have Quicklisp installed by default.
- QUICKLISP_ADD_TO_INIT_FILE=true /usr/local/bin/install-quicklisp

# Upgrade ASDF (UIOP) to 3.3.5 because we want package-local-nicknames.
- mkdir -p ~/common-lisp/asdf/
- ( cd ~/common-lisp/ && wget https://asdf.common-lisp.dev/archives/asdf-3.3.5.tar.gz && tar -xvf asdf-3.3.5.tar.gz && mv asdf-3.3.5 asdf )
- echo "Content of ~/common-lisp/asdf/:" && ls ~/common-lisp/asdf/

# Install system dependencies
- make debian-deps
# Clone upstream QL libraries.
- make ql-deps

build:
# stage: build
build debian:
stage: build

# Build on Debian and SBCL.
# We want to build CIEL in a sufficiently old Debian version:
# the glibc will be compatible with lots of Debian and Ubuntu systems,
# however building on the latest (Bullseye) would lead to incompatible glibc errors
# when running on newer systems.
# Buster: released in July, 2019.
# Bullseye: released in August, 2021, supported until July, 2024.
image: clfoundation/sbcl:2.1.5-buster

# We need to install some system dependencies,
# to clone libraries not in Quicklisp,
# and to update ASDF to >= 3.3.5 in order to use local-package-nicknames.
before_script:
- apt-get update -qy
- apt-get install -y git-core tar

# The image doesn't have Quicklisp installed by default.
- QUICKLISP_ADD_TO_INIT_FILE=true /usr/local/bin/install-quicklisp

# Upgrade ASDF (UIOP) to 3.3.5 because we want package-local-nicknames.
- mkdir -p ~/common-lisp/asdf/
- ( cd ~/common-lisp/ && wget https://asdf.common-lisp.dev/archives/asdf-3.3.5.tar.gz && tar -xvf asdf-3.3.5.tar.gz && mv asdf-3.3.5 asdf )
- echo "Content of ~/common-lisp/asdf/:" && ls ~/common-lisp/asdf/

# Install system dependencies
- make debian-deps
# Clone upstream QL libraries.
- make ql-deps
script:
- make build
# - make image
- mv bin ciel-v0
- mv bin ciel-v0-debian

artifacts:
name: "ciel-v0-debian"
paths:
- ciel-v0-debian/

build void:
stage: build
# Use custom docker image since the official ones
# can't be used in gitlab CI pipelines
image: cinerion/ciel-sbcl-voidlinux

# We need to install some system dependencies,
# to clone libraries not in Quicklisp,
# and to update ASDF to >= 3.3.5 in order to use local-package-nicknames.
before_script:
- xbps-install -Syu

# Upgrade ASDF (UIOP) to 3.3.5 because we want package-local-nicknames.
- mkdir -p ~/common-lisp/asdf/
- ( cd ~/common-lisp/ && wget https://asdf.common-lisp.dev/archives/asdf-3.3.5.tar.gz && tar -xvf asdf-3.3.5.tar.gz && mv asdf-3.3.5 asdf )
- echo "Content of ~/common-lisp/asdf/:" && ls ~/common-lisp/asdf/

# Clone upstream QL libraries.
- make ql-deps
script:
- make build
- mv bin ciel-v0-void

artifacts:
name: "ciel-v0"
name: "ciel-v0-void"
paths:
- ciel-v0/
- ciel-v0-void/
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,19 @@ images, you must build it yourself.
You don't need anything, just download the CIEL executable and run its
REPL. You need to build the core image yourself though.

- we provide an experimental binary for Debian systems: go to
- we provide an experimental binary for some systems: go to
<https://gitlab.com/vindarel/ciel/-/pipelines>, download the latest
artifacts, unzip the `ciel-v0.zip` archive and run `ciel-v0/ciel`.
artifacts, unzip the `ciel-v0-{platform}.zip` archive and run `ciel-v0-{platform}/ciel`.

TODO: build it for different platforms.
CIEL is currently built for the following platforms:

| Platform | System Version (release date) |
|----------|-------------------------------|
| debian | Debian Buster (2019) |
| void | Void Linux glibc (2023-05) |


TODO: build it for more platforms.

To build it, clone this repository and run `make build`.

Expand Down
5 changes: 4 additions & 1 deletion src/scripts/finder.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
(defun find-on-directory (root params)
(fof:finder*
:root root
:predicates (apply #'fof/p:every-path~ params)))
;; "and" the params: needs ongoing PR.
;; :predicates (apply #'fof/p:every-path~ params)))
;; does a "or":
:predicates (apply #'fof/p:path~ params)))

(defun find-files (&optional params)
(unless params
Expand Down