Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add support for building with OpenSSL 3 #244

Merged
merged 2 commits into from
Jan 5, 2023
Merged

Add support for building with OpenSSL 3 #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6d7a5
Add support for building with OpenSSL 3
SeanTAllen Jan 3, 2023
44682e9
Update crypto to fix windows
SeanTAllen Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .ci-dockerfiles/ubuntu22.04-bootstrap-tester/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: SSL=3.0.x .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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions corral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"deps": [
{
"locator": "github.com/ponylang/crypto.git",
"version": "1.1.6"
"version": "1.2.1"
},
{
"locator": "github.com/ponylang/appdirs.git",
"version": "0.1.5"
},
{
"locator": "github.com/ponylang/http.git",
"version": "0.5.2"
"version": "0.5.3"
}
],
"info": {
Expand Down