Skip to content

Commit 82f5e25

Browse files
author
Vito Van
committed
upgrade sbcl to 2.4.7
- adding macos-14 (arm64) build - removing ubuntu 22.04 build retaining 20.04, which should work on 22.04
1 parent 493899d commit 82f5e25

File tree

1 file changed

+31
-20
lines changed

1 file changed

+31
-20
lines changed

.github/workflows/sbcl.yml

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
os: [ubuntu-20.04, ubuntu-22.04]
17+
os: [ubuntu-20.04]
1818

1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
@@ -25,19 +25,26 @@ jobs:
2525
run: |
2626
sudo apt update -y
2727
sudo apt install build-essential -y
28-
sudo apt install sbcl libzstd-dev -y
28+
sudo apt install libzstd-dev -y
2929
- name: build
3030
run: |
31+
# use custom built sbcl for grandpa ubuntu
32+
# otherwise, it won't build
33+
curl -o install_root.zip -L https://github.com/VitoVan/calm/releases/download/sbcl-2.3.4/install_root-ubuntu-20.04.zip
34+
unzip install_root.zip
35+
mv ./install_root ./sbcl
36+
export PATH=$(pwd)/sbcl/bin:$PATH
37+
# start building new sbcl
3138
set -x
32-
curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
39+
curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
3340
set +x
34-
bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
35-
cd sbcl-2.3.4
36-
sh make.sh --with-fancy --with-sb-core-compression
41+
bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
42+
cd sbcl-2.4.7
43+
sh make.sh --with-sb-thread --with-sb-core-compression
3744
- name: zip install_root
3845
run: |
3946
set -x
40-
cd sbcl-2.3.4
47+
cd sbcl-2.4.7
4148
export INSTALL_ROOT=$HOME/install_root
4249
sh install.sh
4350
cd ..
@@ -58,7 +65,7 @@ jobs:
5865

5966
strategy:
6067
matrix:
61-
os: [macos-11, macos-12, macos-13]
68+
os: [macos-12, macos-13, macos-14]
6269

6370
# Steps represent a sequence of tasks that will be executed as part of the job
6471
steps:
@@ -69,19 +76,23 @@ jobs:
6976
- name: install
7077
shell: bash
7178
run: |
72-
brew install sbcl
79+
brew update && brew install sbcl && brew fetch zstd && brew reinstall zstd
7380
- name: build
7481
run: |
82+
# for newer version of homebrew, the location of files has changed
83+
export CPATH=$(brew --prefix zstd)/include:/usr/local/include:$CPATH
84+
export LIBRARY_PATH=$(brew --prefix zstd)/lib/:$LIBRARY_PATH
85+
# start building
7586
set -x
76-
curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
87+
curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
7788
set +x
78-
bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
79-
cd sbcl-2.3.4
80-
sh make.sh --with-fancy --with-sb-core-compression
89+
bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
90+
cd sbcl-2.4.7
91+
sh make.sh --with-sb-thread --with-sb-core-compression
8192
- name: zip install_root
8293
run: |
8394
set -x
84-
cd sbcl-2.3.4
95+
cd sbcl-2.4.7
8596
export INSTALL_ROOT=$HOME/install_root
8697
sh install.sh
8798
cd ..
@@ -102,7 +113,7 @@ jobs:
102113

103114
strategy:
104115
matrix:
105-
os: [windows-2022, windows-2019]
116+
os: [windows-2019]
106117

107118
defaults:
108119
run:
@@ -129,14 +140,14 @@ jobs:
129140
run: |
130141
wget http://prdownloads.sourceforge.net/sbcl/sbcl-2.2.7-x86-64-windows-binary.msi
131142
7z x sbcl-2.2.7-x86-64-windows-binary.msi -Osbcl-2.2.7-bin && rm sbcl-2.2.7-x86-64-windows-binary.msi
132-
wget http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
133-
bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
134-
cd sbcl-2.3.4
135-
PATH=$PATH:"../sbcl-2.2.7-bin/" SBCL_HOME="../sbcl-2.2.7-bin/" sh make.sh --xc-host='sbcl --lose-on-corruption --disable-ldb --disable-debugger' --with-fancy --with-sb-core-compression
143+
wget http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
144+
bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
145+
cd sbcl-2.4.7
146+
PATH=$PATH:"../sbcl-2.2.7-bin/" SBCL_HOME="../sbcl-2.2.7-bin/" sh make.sh --xc-host='sbcl --lose-on-corruption --disable-ldb --disable-debugger' --with-sb-thread --with-sb-core-compression
136147
- name: zip install_root
137148
run: |
138149
set -x
139-
cd sbcl-2.3.4
150+
cd sbcl-2.4.7
140151
export INSTALL_ROOT=$HOME/install_root
141152
sh install.sh
142153
cd ..

0 commit comments

Comments
 (0)