diff --git a/.github/workflows/linux-builder-update.yml b/.github/workflows/linux-builder-update.yml index fa96efb..be99197 100644 --- a/.github/workflows/linux-builder-update.yml +++ b/.github/workflows/linux-builder-update.yml @@ -106,40 +106,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_1q: - needs: - - x86-64-unknown-linux-builder - - name: Update x86-64-unknown-linux-builder-with-openssl_1.1.1q - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Login to DockerHub - run: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" - env: - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - - name: Login to GitHub Container Registry - # v2.2.0 - uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc - 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.1q/build-and-push.bash - - name: Send alert on failure - if: ${{ failure() }} - uses: zulip/github-actions-zulip/send-message@b62d5a0e48a4d984ea4fce5dd65ba691963d4db4 - 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_1t: needs: - x86-64-unknown-linux-builder @@ -315,7 +281,6 @@ jobs: - 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-openssl_1_1_1q - 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_0_7 @@ -389,7 +354,6 @@ jobs: - 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-openssl_1.1.1q - 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.0.7 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 150f9c9..a81869a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -62,14 +62,6 @@ jobs: - 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-openssl_1_1_1q-image-builds: - name: Validate x86-64-unknown-linux-builder-with-openssl_1.1.1q Docker image builds - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Docker build - run: "docker build --pull --file=x86-64-unknown-linux-builder-with-openssl_1.1.1q/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 diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/Dockerfile b/x86-64-unknown-linux-builder-with-openssl_1.1.1q/Dockerfile deleted file mode 100644 index 05c3b83..0000000 --- a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/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_1q.tar.gz && \ - tar xf OpenSSL_1_1_1q.tar.gz && \ - cd openssl-OpenSSL_1_1_1q && \ - ./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_1q diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/README.md b/x86-64-unknown-linux-builder-with-openssl_1.1.1q/README.md deleted file mode 100644 index ed637c2..0000000 --- a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# x86-64-unknown-linux-builder-with-openssl_1.1.1q - -The x86-64-unknown-linux-builder with OpenSSL 1.1.1q implementation installed as well. Rebuilt daily. diff --git a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/build-and-push.bash b/x86-64-unknown-linux-builder-with-openssl_1.1.1q/build-and-push.bash deleted file mode 100644 index dd31b3b..0000000 --- a/x86-64-unknown-linux-builder-with-openssl_1.1.1q/build-and-push.bash +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o nounset - -# -# *** You should already be logged in to DockerHub -# and GitHub Container Registry when you run this *** -# - -DOCKERFILE_DIR="$(dirname "$0")" - -## DockerHub - -NAME="ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.1q" - -# 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}" - -## GitHub Container Registry - -NAME="ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.1q" - -# 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}"