From 7ea5b8482b7c4a648b315361fc144beb7abf5a3e Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@seantallen.com>
Date: Thu, 18 Apr 2024 20:18:40 -0400
Subject: [PATCH] Deprecate some SSL builders (#81)

Closes #78
Closes #77
Closes #76
---
 .github/workflows/linux-builder-update.yml    | 93 -------------------
 .github/workflows/pr.yml                      | 24 -----
 .../Dockerfile                                | 11 ---
 .../README.md                                 |  3 -
 .../build-and-push.bash                       | 29 ------
 .../Dockerfile                                | 16 ----
 .../README.md                                 |  3 -
 .../build-and-push.bash                       | 29 ------
 .../Dockerfile                                | 22 -----
 .../README.md                                 |  3 -
 .../build-and-push.bash                       | 29 ------
 11 files changed, 262 deletions(-)
 delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.2/Dockerfile
 delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.2/README.md
 delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.2/build-and-push.bash
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_1.1.1t/Dockerfile
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_1.1.1t/README.md
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_1.1.1t/build-and-push.bash
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_3.1.0/Dockerfile
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_3.1.0/README.md
 delete mode 100644 x86-64-unknown-linux-builder-with-openssl_3.1.0/build-and-push.bash

diff --git a/.github/workflows/linux-builder-update.yml b/.github/workflows/linux-builder-update.yml
index af7b3c6..a997fd8 100644
--- a/.github/workflows/linux-builder-update.yml
+++ b/.github/workflows/linux-builder-update.yml
@@ -33,35 +33,6 @@ jobs:
           topic: ${{ github.repository }} scheduled job failure
           content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
 
-  x86-64-unknown-linux-builder-with-libressl_3_7_2:
-    needs:
-      - x86-64-unknown-linux-builder
-
-    name: Update x86-64-unknown-linux-builder-with-libressl-3.7.2
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Login to GitHub Container Registry
-        # v2.2.0
-        uses: docker/login-action@5139682d94efc37792e6b54386b5b470a68a4737
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        run: bash x86-64-unknown-linux-builder-with-libressl-3.7.2/build-and-push.bash
-      - name: Send alert on failure
-        if: ${{ failure() }}
-        uses: zulip/github-actions-zulip/send-message@08b6fbd07f5834e5b930a85bc7740e9fd44ab2e7
-        with:
-          api-key: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_API_KEY }}
-          email: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_EMAIL }}
-          organization-url: 'https://ponylang.zulipchat.com/'
-          to: notifications
-          type: stream
-          topic: ${{ github.repository }} scheduled job failure
-          content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
-
   x86-64-unknown-linux-builder-with-libressl_3_7_3:
     needs:
       - x86-64-unknown-linux-builder
@@ -120,35 +91,6 @@ jobs:
           topic: ${{ github.repository }} scheduled job failure
           content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
 
-  x86-64-unknown-linux-builder-with-openssl_1_1_1t:
-    needs:
-      - x86-64-unknown-linux-builder
-
-    name: Update x86-64-unknown-linux-builder-with-openssl_1.1.1t
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Login to GitHub Container Registry
-        # v2.2.0
-        uses: docker/login-action@5139682d94efc37792e6b54386b5b470a68a4737
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        run: bash x86-64-unknown-linux-builder-with-openssl_1.1.1t/build-and-push.bash
-      - name: Send alert on failure
-        if: ${{ failure() }}
-        uses: zulip/github-actions-zulip/send-message@08b6fbd07f5834e5b930a85bc7740e9fd44ab2e7
-        with:
-          api-key: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_API_KEY }}
-          email: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_EMAIL }}
-          organization-url: 'https://ponylang.zulipchat.com/'
-          to: notifications
-          type: stream
-          topic: ${{ github.repository }} scheduled job failure
-          content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
-
   x86-64-unknown-linux-builder-with-openssl_1_1_1w:
     needs:
       - x86-64-unknown-linux-builder
@@ -178,35 +120,6 @@ jobs:
           topic: ${{ github.repository }} scheduled job failure
           content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
 
-  x86-64-unknown-linux-builder-with-openssl_3_1_0:
-    needs:
-      - x86-64-unknown-linux-builder
-
-    name: Update x86-64-unknown-linux-builder-with-openssl_3.1.0
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Login to GitHub Container Registry
-        # v2.2.0
-        uses: docker/login-action@5139682d94efc37792e6b54386b5b470a68a4737
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        run: bash x86-64-unknown-linux-builder-with-openssl_3.1.0/build-and-push.bash
-      - name: Send alert on failure
-        if: ${{ failure() }}
-        uses: zulip/github-actions-zulip/send-message@08b6fbd07f5834e5b930a85bc7740e9fd44ab2e7
-        with:
-          api-key: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_API_KEY }}
-          email: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_EMAIL }}
-          organization-url: 'https://ponylang.zulipchat.com/'
-          to: notifications
-          type: stream
-          topic: ${{ github.repository }} scheduled job failure
-          content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
-
   x86-64-unknown-linux-builder-with-openssl_3_1_3:
     needs:
       - x86-64-unknown-linux-builder
@@ -326,12 +239,9 @@ jobs:
   send-linux-builders-updated-event:
     needs:
       - x86-64-unknown-linux-builder
-      - x86-64-unknown-linux-builder-with-libressl_3_7_2
       - x86-64-unknown-linux-builder-with-libressl_3_7_3
       - x86-64-unknown-linux-builder-with-libressl_3_9_1
-      - x86-64-unknown-linux-builder-with-openssl_1_1_1t
       - x86-64-unknown-linux-builder-with-openssl_1_1_1w
-      - x86-64-unknown-linux-builder-with-openssl_3_1_0
       - x86-64-unknown-linux-builder-with-openssl_3_1_3
       - x86-64-unknown-linux-builder-with-openssl_3_2_0
       - x86-64-unknown-linux-builder-with-openssl_3_3_0
@@ -402,12 +312,9 @@ jobs:
       matrix:
         image:
           - shared-docker-ci-x86-64-unknown-linux-builder
-          - shared-docker-ci-x86-64-unknown-linux-builder-with-libressl-3.7.2
           - shared-docker-ci-x86-64-unknown-linux-builder-with-libressl-3.7.3
           - shared-docker-ci-x86-64-unknown-linux-builder-with-libressl-3.9.1
-          - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.1t
           - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.1w
-          - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_3.1.0
           - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_3.1.3
           - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_3.2.0
           - shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_3.3.0
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8234ccb..3224f97 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -54,14 +54,6 @@ jobs:
       - name: Docker build
         run: "docker build --pull --file=x86-64-unknown-linux-builder/Dockerfile ."
 
-  validate-x86-64-unknown-linux-builder-with-libressl-3_7_2-image-builds:
-    name: Validate x86-64-unknown-linux-builder-with-libressl-3.7.2 Docker image builds
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Docker build
-        run: "docker build --pull --file=x86-64-unknown-linux-builder-with-libressl-3.7.2/Dockerfile ."
-
   validate-x86-64-unknown-linux-builder-with-libressl-3_7_3-image-builds:
     name: Validate x86-64-unknown-linux-builder-with-libressl-3.7.3 Docker image builds
     runs-on: ubuntu-latest
@@ -78,14 +70,6 @@ jobs:
       - name: Docker build
         run: "docker build --pull --file=x86-64-unknown-linux-builder-with-libressl-3.9.1/Dockerfile ."
 
-  validate-x86-64-unknown-linux-builder-with-openssl_1_1_1t-image-builds:
-    name: Validate x86-64-unknown-linux-builder-with-openssl_1.1.1t Docker image builds
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Docker build
-        run: "docker build --pull --file=x86-64-unknown-linux-builder-with-openssl_1.1.1t/Dockerfile ."
-
   validate-x86-64-unknown-linux-builder-with-openssl_1_1_1w-image-builds:
     name: Validate x86-64-unknown-linux-builder-with-openssl_1.1.1w Docker image builds
     runs-on: ubuntu-latest
@@ -94,14 +78,6 @@ jobs:
       - name: Docker build
         run: "docker build --pull --file=x86-64-unknown-linux-builder-with-openssl_1.1.1w/Dockerfile ."
 
-  validate-x86-64-unknown-linux-builder-with-openssl_3_1_0-image-builds:
-    name: Validate x86-64-unknown-linux-builder-with-openssl_3.1.0 Docker image builds
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-      - name: Docker build
-        run: "docker build --pull --file=x86-64-unknown-linux-builder-with-openssl_3.1.0/Dockerfile ."
-
   validate-x86-64-unknown-linux-builder-with-openssl_3_1_3-image-builds:
     name: Validate x86-64-unknown-linux-builder-with-openssl_3.1.3 Docker image builds
     runs-on: ubuntu-latest
diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.2/Dockerfile b/x86-64-unknown-linux-builder-with-libressl-3.7.2/Dockerfile
deleted file mode 100644
index 0ead43f..0000000
--- a/x86-64-unknown-linux-builder-with-libressl-3.7.2/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-ARG FROM_TAG=release
-FROM ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:${FROM_TAG}
-
-RUN cd /tmp && \
-  wget https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz && \
-  tar xf libressl-3.7.2.tar.gz && \
-  cd libressl-3.7.2/ && \
-  ./configure && \
-  make install && \
-  cd /tmp && \
-  rm -rf libressl*
diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.2/README.md b/x86-64-unknown-linux-builder-with-libressl-3.7.2/README.md
deleted file mode 100644
index cd545f2..0000000
--- a/x86-64-unknown-linux-builder-with-libressl-3.7.2/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# x86-64-unknown-linux-builder-with-libressl-3.7.2
-
-The x86-64-unknown-linux-builder with libressl 3.7.2 SSL implementation installed as well. Rebuilt daily.
diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.2/build-and-push.bash b/x86-64-unknown-linux-builder-with-libressl-3.7.2/build-and-push.bash
deleted file mode 100644
index df7c996..0000000
--- a/x86-64-unknown-linux-builder-with-libressl-3.7.2/build-and-push.bash
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-#
-# *** You should already be logged in to GitHub Container Registry when you run
-#     this ***
-#
-
-DOCKERFILE_DIR="$(dirname "$0")"
-
-## GitHub Container Registry
-
-NAME="ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-libressl-3.7.2"
-
-# built from x86-64-unknown-linux-builder release tag
-FROM_TAG=release
-TAG_AS=release
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"
-
-# built from x86-64-unknown-linux-builder latest tag
-FROM_TAG=latest
-TAG_AS=latest
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"
diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/Dockerfile b/x86-64-unknown-linux-builder-with-openssl_1.1.1t/Dockerfile
deleted file mode 100644
index f81f7aa..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-ARG FROM_TAG=release
-FROM ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:${FROM_TAG}
-
-RUN apk add --update --no-cache \
-  clang-dev \
-  linux-headers \
-  perl
-
-RUN cd /tmp && \
-  wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz && \
-  tar xf OpenSSL_1_1_1t.tar.gz && \
-  cd openssl-OpenSSL_1_1_1t && \
-  ./Configure --api=1.1.0 no-shared linux-x86_64 enable-rc5 enable-md2 && \
-  make install_sw && \
-  cd /tmp && \
-  rm -rf openssl-OpenSSL_1_1_1t
diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/README.md b/x86-64-unknown-linux-builder-with-openssl_1.1.1t/README.md
deleted file mode 100644
index e0eb59a..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# x86-64-unknown-linux-builder-with-openssl_1.1.1t
-
-The x86-64-unknown-linux-builder with OpenSSL 1.1.1t implementation installed as well. Rebuilt daily.
diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/build-and-push.bash b/x86-64-unknown-linux-builder-with-openssl_1.1.1t/build-and-push.bash
deleted file mode 100644
index d06a08b..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_1.1.1t/build-and-push.bash
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-#
-# *** You should already be logged in to GitHub Container Registry when you run
-#     this ***
-#
-
-DOCKERFILE_DIR="$(dirname "$0")"
-
-## GitHub Container Registry
-
-NAME="ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.1t"
-
-# built from x86-64-unknown-linux-builder release tag
-FROM_TAG=release
-TAG_AS=release
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"
-
-# built from x86-64-unknown-linux-builder latest tag
-FROM_TAG=latest
-TAG_AS=latest
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"
diff --git a/x86-64-unknown-linux-builder-with-openssl_3.1.0/Dockerfile b/x86-64-unknown-linux-builder-with-openssl_3.1.0/Dockerfile
deleted file mode 100644
index 5c4d58f..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_3.1.0/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG FROM_TAG=release
-FROM ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:${FROM_TAG}
-
-RUN apk add --update --no-cache \
-  clang-dev \
-  linux-headers \
-  perl
-
-RUN cd /tmp && \
-  wget https://www.openssl.org/source/old/3.1/openssl-3.1.0.tar.gz && \
-  tar xf openssl-3.1.0.tar.gz && \
-  cd openssl-3.1.0 && \
-  ./Configure --api=3.0.0 no-shared linux-x86_64 enable-rc5 enable-md2 && \
-  make && \
-  make install && \
-  cd /tmp && \
-  rm -rf openssl-3.1.0
-
-# For some reason, even though lib64 is in the linker search path, the
-# libraries when installed there can't be found
-RUN cp /usr/local/lib64/libssl.a /usr/local/lib/ && \
-  cp /usr/local/lib64/libcrypto.a /usr/local/lib
diff --git a/x86-64-unknown-linux-builder-with-openssl_3.1.0/README.md b/x86-64-unknown-linux-builder-with-openssl_3.1.0/README.md
deleted file mode 100644
index ab3bacd..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_3.1.0/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# x86-64-unknown-linux-builder-with-openssl_3.1.0
-
-The x86-64-unknown-linux-builder with OpenSSL 3.1.0 implementation installed as well. Rebuilt daily.
diff --git a/x86-64-unknown-linux-builder-with-openssl_3.1.0/build-and-push.bash b/x86-64-unknown-linux-builder-with-openssl_3.1.0/build-and-push.bash
deleted file mode 100644
index 403c52a..0000000
--- a/x86-64-unknown-linux-builder-with-openssl_3.1.0/build-and-push.bash
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-#
-# *** You should already be logged in to GitHub Container Registry when you run
-#     this ***
-#
-
-DOCKERFILE_DIR="$(dirname "$0")"
-
-## GitHub Container Registry
-
-NAME="ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_3.1.0"
-
-# built from x86-64-unknown-linux-builder release tag
-FROM_TAG=release
-TAG_AS=release
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"
-
-# built from x86-64-unknown-linux-builder latest tag
-FROM_TAG=latest
-TAG_AS=latest
-docker build --pull --build-arg FROM_TAG="${FROM_TAG}" \
-  -t "${NAME}:${TAG_AS}" "${DOCKERFILE_DIR}"
-docker push "${NAME}:${TAG_AS}"