Merge branch 'master' of github.com:black-sat/black

docker/Dockerfile.fedora

@@ -2,15 +2,18 @@ ARG VERSION=36
 FROM fedora:$VERSION
 RUN echo 'fastestmirror=1' >> /etc/dnf/dnf.conf
 RUN yum update -y
-RUN yum install -y make cmake gcc gcc-c++ python3-pip java 
+RUN yum install -y make cmake gcc gcc-c++ python3.10 python3-pip java flex
 RUN yum install -y zlib-devel fmt-devel catch-devel git wget rpm-build m4
 RUN yum install -y z3-devel cryptominisat-devel gmp-devel gmp-c++
 
-RUN pip3 install toml
+RUN python3.10 -m ensurepip && python3.10 -m pip install toml pyparsing
+
+ENV Python3_EXECUTABLE=/usr/bin/python3.10
+ENV PYTHON_EXECUTABLE=/usr/bin/python3.10
 
 RUN git clone https://github.com/cvc5/cvc5.git /cvc5
 WORKDIR /cvc5
-RUN git checkout cvc5-1.0.0
+RUN git checkout cvc5-1.0.5
 RUN ./configure.sh production --no-python-bindings --no-java-bindings --auto-download
 
 WORKDIR /cvc5/build

release.sh

@@ -31,9 +31,9 @@ images() {
     -f docker/Dockerfile.ubuntu -t black:ubuntu22.04 \
     --build-arg VERSION=22.04 --build-arg GCC_VERSION=12
   docker build docker \
-    -f docker/Dockerfile.fedora -t black:fedora36 --build-arg VERSION=37
+    -f docker/Dockerfile.fedora -t black:fedora37 --build-arg VERSION=37
   docker build docker \
-    -f docker/Dockerfile.fedora -t black:fedora36 --build-arg VERSION=38
+    -f docker/Dockerfile.fedora -t black:fedora38 --build-arg VERSION=38
 }
 
 launch() {
@@ -141,7 +141,7 @@ release() {
   fi
   gh release create --notes-file $temp -p -t v$VERSION --target master v$VERSION
 
-  for file in packages/$VERSION/*; do
+  for file in packages/$VERSION/*.{rpm,deb,zip}; do
     gh release upload v$VERSION $file
   done
 }