-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Updated swipl stable to 9.2.6 #17243
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note that this also updates 9.3.8/bookworm/Dockerfile, which had its tag updated, but not the actual version.
Diff for 04ff2df:diff --git a/_bashbrew-cat b/_bashbrew-cat
index d154cde..d4b871f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,10 +1,10 @@
Maintainers: Jan Wielemaker <[email protected]> (@JanWielemaker), Dave Curylo <[email protected]> (@ninjarobot)
Architectures: amd64, arm32v7, arm64v8
GitRepo: https://github.com/SWI-Prolog/docker-swipl.git
-GitCommit: debcf80f61dab217a2ade259a203a2b9e6f0a268
+GitCommit: 053b5508dfed21e7549947113893517c64494cce
Tags: latest, 9.3.8
Directory: 9.3.8/bookworm
-Tags: stable, 9.2.5
-Directory: 9.2.5/bookworm
+Tags: stable, 9.2.6
+Directory: 9.2.6/bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index fbe5449..346437d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
-swipl:9.2.5
+swipl:9.2.6
swipl:9.3.8
swipl:latest
swipl:stable
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2bae6b5..066c668 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-swipl:9.2.5
+swipl:9.2.6
swipl:9.3.8
diff --git a/swipl_9.2.5/Dockerfile b/swipl_9.2.6/Dockerfile
similarity index 88%
rename from swipl_9.2.5/Dockerfile
rename to swipl_9.2.6/Dockerfile
index 9f63e85..9de81ad 100644
--- a/swipl_9.2.5/Dockerfile
+++ b/swipl_9.2.6/Dockerfile
@@ -27,8 +27,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
ENV LANG C.UTF-8
RUN set -eux; \
- SWIPL_VER=9.2.5; \
- SWIPL_CHECKSUM=b9f40771906c7e04be80ae4cfaa4463aeb44c52010a478edd8c7a4c022fe8781; \
+ SWIPL_VER=9.2.6; \
+ SWIPL_CHECKSUM=0cb9b80b9922be8165cbac384ebe050d94553e72cf7aebfc980b4395ff01d05d; \
# Removed libgeos-dev libspatialindex-dev because the space pack cannot be built
BUILD_DEPS='make cmake ninja-build gcc g++ wget git pkg-config m4 libtool automake autoconf libarchive-dev libgmp-dev libossp-uuid-dev libpcre2-dev libreadline-dev libedit-dev libssl-dev zlib1g-dev libdb-dev unixodbc-dev libsqlite3-dev libserd-dev libraptor2-dev libyaml-dev libgoogle-perftools-dev libpython3-dev'; \
dpkgArch="$(dpkg --print-architecture)"; \
@@ -67,9 +67,9 @@ RUN set -eux; \
install_addin prosqlite https://github.com/nicos-angelopoulos/prosqlite.git 95aba2a5c156b831cf2bcfd387f65a9b470280e4; \
# C++ packages are currently incompatible with 32 bit. Must be upgraded to SWI-cpp2.h when stable.
# libgeos-dev of Debian bookworm is broken: the library does not define the Coordinate constructors nor the inline code to avoid calling these.
- # [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin space https://github.com/JanWielemaker/space.git 8ab230a67e2babb3e81fac043512a7de7f4593bf; \
- [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rocksdb https://github.com/JanWielemaker/rocksdb.git 3cf540598adc646eafd4d439f5446236a8587677; \
- install_addin hdt https://github.com/JanWielemaker/hdt.git 2923cb69f4a558cdc1866b033e1d69dab20aedd9; \
- [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rserve_client https://github.com/JanWielemaker/rserve_client.git e35854942009ad2d06d6e21854c96e49c28d8b1e; \
+ # [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin space https://github.com/JanWielemaker/space.git 097687c7b67902704b03f095cc2f1e943181e700; \
+ [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rocksdb https://github.com/JanWielemaker/rocksdb.git a63f1f5650e44c7d40401ed5a8b689aa1caca635; \
+ install_addin hdt https://github.com/JanWielemaker/hdt.git 7f2221747ea751a20ad0d7b95aebfd2c99649c1f; \
+ [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rserve_client https://github.com/JanWielemaker/rserve_client.git bdf8962264d65dd8ef6eedf5f00ff0c0f6c52c2f; \
apt-get purge -y --auto-remove $BUILD_DEPS
CMD ["swipl"]
diff --git a/swipl_9.3.8/Dockerfile b/swipl_9.3.8/Dockerfile
index ddb74e2..9ebe9d7 100644
--- a/swipl_9.3.8/Dockerfile
+++ b/swipl_9.3.8/Dockerfile
@@ -69,7 +69,7 @@ RUN set -eux; \
# libgeos-dev of Debian bookworm is broken: the library does not define the Coordinate constructors nor the inline code to avoid calling these.
# [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin space https://github.com/JanWielemaker/space.git 097687c7b67902704b03f095cc2f1e943181e700; \
[ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rocksdb https://github.com/JanWielemaker/rocksdb.git a63f1f5650e44c7d40401ed5a8b689aa1caca635; \
- install_addin hdt https://github.com/JanWielemaker/hdt.git 2923cb69f4a558cdc1866b033e1d69dab20aedd9; \
+ install_addin hdt https://github.com/JanWielemaker/hdt.git 7f2221747ea751a20ad0d7b95aebfd2c99649c1f; \
[ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rserve_client https://github.com/JanWielemaker/rserve_client.git bdf8962264d65dd8ef6eedf5f00ff0c0f6c52c2f; \
apt-get purge -y --auto-remove $BUILD_DEPS
CMD ["swipl"] Relevant Maintainers:
|
tianon
approved these changes
Jul 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that this also updates 9.3.8/bookworm/Dockerfile, which had its tag updated, but not the actual version.