Skip to content

Commit 96008a5

Browse files
committed
Merge branch 'master' of github.com:jgaa/restc-cpp into https_proxy
2 parents bad32d4 + 5080fa4 commit 96008a5

File tree

4 files changed

+117
-104
lines changed

4 files changed

+117
-104
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (DEFINED ENV{RESTC_CPP_VERSION})
1111
endif()
1212

1313
if (NOT DEFINED RESTC_CPP_VERSION)
14-
set(RESTC_CPP_VERSION 0.98.0)
14+
set(RESTC_CPP_VERSION 0.99.0)
1515
endif()
1616

1717
if(NOT DEFINED RESTC_BOOST_VERSION)

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,16 @@ These are the operating systems where my Continues Integration (Jenkins) servers
256256

257257
- Debian Testing
258258
- Debian Bookworm
259-
- Debian Bullseye (Stable)
259+
- Debian Bullseye
260260
- Debian Buster
261261
- Windows 10 / Microsoft Visual Studio 2019, Community version using vcpkg for dependencies
262262
- Ubuntu Xenial (LTS)
263+
- Ubuntu Jammy (LTS)
263264

264265
Support for MacOS has been removed after Apples announcement that their love for privacy was just
265266
a marketing gimmick.
266267

267-
Fedora is currently disabled in my CI because of failures to start their Docker containers. (Work in progress). Ubuntu Jammy don't work in docker with my Jenkins CI pipeline, so I have no reliable way to test it. Windows 11 cannot be run on my KVM /QEMU system, because it don't support "secure" boot, so I have no way to test it.
268+
Fedora is currently disabled in my CI because of failures to start their Docker containers. (Work in progress).
268269

269270
The Jenkins setup is [here](ci/jenkins).
270271

ci/jenkins/Dockefile.ubuntu-jammy

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
1414
# Set user jenkins to the image
1515
RUN useradd -m -d /home/jenkins -s /bin/sh jenkins &&\
1616
echo "jenkins:jenkins" | chpasswd &&\
17-
mkdir -p /home/jenkins/build/workspace/restc-staging
17+
mkdir -p /home/jenkins/build/workspace/restc-staging &&\
18+
mkdir -p /run/sshd
1819

1920
# Standard SSH port
2021
EXPOSE 22

0 commit comments

Comments
 (0)