From 605ad7b24615691a2cc2066d8b5df173aca5524c Mon Sep 17 00:00:00 2001 From: "Sean T. Allen" Date: Sun, 13 Oct 2024 20:53:39 +0000 Subject: [PATCH] Remove LibreSSL 3.7.3 builder --- .github/workflows/linux-builder-update.yml | 30 ------------------- .github/workflows/pr.yml | 8 ----- .../Dockerfile | 11 ------- .../README.md | 3 -- .../build-and-push.bash | 29 ------------------ 5 files changed, 81 deletions(-) delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.3/Dockerfile delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.3/README.md delete mode 100644 x86-64-unknown-linux-builder-with-libressl-3.7.3/build-and-push.bash diff --git a/.github/workflows/linux-builder-update.yml b/.github/workflows/linux-builder-update.yml index 47cbc49..6b27ed1 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_3: - needs: - - x86-64-unknown-linux-builder - - name: Update x86-64-unknown-linux-builder-with-libressl-3.7.3 - 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.3/build-and-push.bash - - name: Send alert on failure - if: ${{ failure() }} - uses: zulip/github-actions-zulip/send-message@e4c8f27c732ba9bd98ac6be0583096dea82feea5 - 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_9_1: needs: - x86-64-unknown-linux-builder @@ -239,7 +210,6 @@ jobs: send-linux-builders-updated-event: needs: - x86-64-unknown-linux-builder - - 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_1w - x86-64-unknown-linux-builder-with-openssl_3_1_3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3224f97..d7ebb9d 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_3-image-builds: - name: Validate x86-64-unknown-linux-builder-with-libressl-3.7.3 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.3/Dockerfile ." - validate-x86-64-unknown-linux-builder-with-libressl-3_9_1-image-builds: name: Validate x86-64-unknown-linux-builder-with-libressl-3.9.1 Docker image builds runs-on: ubuntu-latest diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.3/Dockerfile b/x86-64-unknown-linux-builder-with-libressl-3.7.3/Dockerfile deleted file mode 100644 index bdc97e2..0000000 --- a/x86-64-unknown-linux-builder-with-libressl-3.7.3/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.3.tar.gz && \ - tar xf libressl-3.7.3.tar.gz && \ - cd libressl-3.7.3/ && \ - ./configure && \ - make install && \ - cd /tmp && \ - rm -rf libressl* diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.3/README.md b/x86-64-unknown-linux-builder-with-libressl-3.7.3/README.md deleted file mode 100644 index d6a9798..0000000 --- a/x86-64-unknown-linux-builder-with-libressl-3.7.3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# x86-64-unknown-linux-builder-with-libressl-3.7.3 - -The x86-64-unknown-linux-builder with libressl 3.7.3 SSL implementation installed as well. Rebuilt daily. diff --git a/x86-64-unknown-linux-builder-with-libressl-3.7.3/build-and-push.bash b/x86-64-unknown-linux-builder-with-libressl-3.7.3/build-and-push.bash deleted file mode 100644 index db4f109..0000000 --- a/x86-64-unknown-linux-builder-with-libressl-3.7.3/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.3" - -# 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}"