diff --git a/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/Dockerfile b/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/Dockerfile new file mode 100644 index 0000000..1cb02f0 --- /dev/null +++ b/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/Dockerfile @@ -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/* diff --git a/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/build-and-push.bash b/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/build-and-push.bash new file mode 100644 index 0000000..9c88260 --- /dev/null +++ b/.ci-dockerfiles/ubuntu22.04-bootstrap-tester/build-and-push.bash @@ -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}" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5b69a04..fd6ae08 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 @@ -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 diff --git a/Makefile b/Makefile index 0691d04..1236a24 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/corral.json b/corral.json index 4e85152..28c2414 100644 --- a/corral.json +++ b/corral.json @@ -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", @@ -10,7 +10,7 @@ }, { "locator": "github.com/ponylang/http.git", - "version": "0.5.2" + "version": "0.5.3" } ], "info": {