Skip to content

Commit

Permalink
Add support for building with OpenSSL 3
Browse files Browse the repository at this point in the history
This includes a builder for Ubuntu 22.04 that features OpenSSL 3 to
verify that it is all working, plus tests to verify that we are
correctly set up to build with OpenSSL 3 support on.
  • Loading branch information
SeanTAllen committed Jan 3, 2023
1 parent 03ee8f0 commit f71584a
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 3 deletions.
11 changes: 11 additions & 0 deletions .ci-dockerfiles/ubuntu22.04-bootstrap-tester/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM ubuntu:22.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
clang \
curl \
git \
libssl-dev \
make \
&& rm -rf /var/lib/apt/lists/*
15 changes: 15 additions & 0 deletions .ci-dockerfiles/ubuntu22.04-bootstrap-tester/build-and-push.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
#

TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

docker build --pull -t "ponylang/ponyup-ci-ubuntu22.04-bootstrap-tester:${TODAY}" \
"${DOCKERFILE_DIR}"
docker push "ponylang/ponyup-ci-ubuntu22.04-bootstrap-tester:${TODAY}"
12 changes: 11 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: SSL=0.9.0 .ci-scripts/test-bootstrap.sh

ubuntu20_04-bootstrap:
name: Test bootstrapping on Ubuntu
name: Test bootstrapping on Ubuntu 20.04
runs-on: ubuntu-latest
container:
image: ponylang/ponyup-ci-ubuntu20.04-bootstrap-tester:20210414
Expand All @@ -66,6 +66,16 @@ jobs:
- name: Bootstrap test
run: .ci-scripts/test-bootstrap.sh

ubuntu22_04-bootstrap:
name: Test bootstrapping on Ubuntu 22.04
runs-on: ubuntu-latest
container:
image: ponylang/ponyup-ci-ubuntu22.04-bootstrap-tester:20230103
steps:
- uses: actions/checkout@v2
- name: Bootstrap test
run: .ci-scripts/test-bootstrap.sh

ubuntu18_04-bootstrap:
name: Test bootstrapping on Ubuntu 18.04
runs-on: ubuntu-latest
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ ifeq ($(config),debug)
PONYC_FLAGS += --debug
endif

ifeq ($(ssl), 1.1.x)
ifeq ($(ssl), 3.0.x)
PONYC_FLAGS += -Dopenssl_3.0.x
else ifeq ($(ssl), 1.1.x)
PONYC_FLAGS += -Dopenssl_1.1.x
else ifeq ($(ssl), 0.9.0)
PONYC_FLAGS += -Dopenssl_0.9.0
Expand Down
2 changes: 1 addition & 1 deletion corral.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"deps": [
{
"locator": "github.com/ponylang/crypto.git",
"version": "1.1.6"
"version": "1.2.0"
},
{
"locator": "github.com/ponylang/appdirs.git",
Expand Down

0 comments on commit f71584a

Please sign in to comment.