Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jgaa/restc-cpp into https_proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
uralm1 committed Aug 30, 2023
2 parents bad32d4 + 5080fa4 commit 96008a5
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 104 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (DEFINED ENV{RESTC_CPP_VERSION})
endif()

if (NOT DEFINED RESTC_CPP_VERSION)
set(RESTC_CPP_VERSION 0.98.0)
set(RESTC_CPP_VERSION 0.99.0)
endif()

if(NOT DEFINED RESTC_BOOST_VERSION)
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,16 @@ These are the operating systems where my Continues Integration (Jenkins) servers

- Debian Testing
- Debian Bookworm
- Debian Bullseye (Stable)
- Debian Bullseye
- Debian Buster
- Windows 10 / Microsoft Visual Studio 2019, Community version using vcpkg for dependencies
- Ubuntu Xenial (LTS)
- Ubuntu Jammy (LTS)

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

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.
Fedora is currently disabled in my CI because of failures to start their Docker containers. (Work in progress).

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

Expand Down
3 changes: 2 additions & 1 deletion ci/jenkins/Dockefile.ubuntu-jammy
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
# Set user jenkins to the image
RUN useradd -m -d /home/jenkins -s /bin/sh jenkins &&\
echo "jenkins:jenkins" | chpasswd &&\
mkdir -p /home/jenkins/build/workspace/restc-staging
mkdir -p /home/jenkins/build/workspace/restc-staging &&\
mkdir -p /run/sshd

# Standard SSH port
EXPOSE 22
Expand Down
Loading

0 comments on commit 96008a5

Please sign in to comment.