From 8c1014273a3332f42c3354b4415a324cfd9f4d60 Mon Sep 17 00:00:00 2001 From: William Roberts Date: Tue, 13 Dec 2022 19:53:06 -0600 Subject: [PATCH 1/4] opensuse-leap-ossl3: rm as unused in CI Signed-off-by: William Roberts --- .github/workflows/main.yml | 2 +- .github/workflows/publish.yml | 2 +- opensuse-leap-ossl3.docker.m4 | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 opensuse-leap-ossl3.docker.m4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c753e06..0efeae0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: matrix: distro: [ "fedora-32", "fedora-32-ossl3", "fedora-34", "fedora-34-libressl", - "opensuse-leap-15.2", "opensuse-leap", "opensuse-leap-ossl3", + "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", "fedora-32.ppc64le", diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3e36f10..03a09f8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: matrix: distro: [ "fedora-32", "fedora-32-ossl3", "fedora-34", "fedora-34-libressl", - "opensuse-leap-15.2", "opensuse-leap", "opensuse-leap-ossl3", + "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", "fedora-32.ppc64le", diff --git a/opensuse-leap-ossl3.docker.m4 b/opensuse-leap-ossl3.docker.m4 deleted file mode 100644 index 3fa1469..0000000 --- a/opensuse-leap-ossl3.docker.m4 +++ /dev/null @@ -1,7 +0,0 @@ -include(`opensuse-leap.docker.m4') - -# Install openssl3 -RUN zypper remove -y libopenssl-devel -include(`ossl3.m4') - -WORKDIR / From 975383a023e535bc9a84b77a60f5834ed3900c49 Mon Sep 17 00:00:00 2001 From: William Roberts Date: Tue, 13 Dec 2022 19:54:25 -0600 Subject: [PATCH 2/4] fedora-32-ossl3: remove as unused in CI Signed-off-by: William Roberts --- .github/workflows/main.yml | 2 +- .github/workflows/publish.yml | 2 +- fedora-32-ossl3.docker.m4 | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 fedora-32-ossl3.docker.m4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0efeae0..cfaae18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: distro: [ - "fedora-32", "fedora-32-ossl3", "fedora-34", "fedora-34-libressl", + "fedora-32", "fedora-34", "fedora-34-libressl", "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 03a09f8..0cc4e7c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: distro: [ - "fedora-32", "fedora-32-ossl3", "fedora-34", "fedora-34-libressl", + "fedora-32", "fedora-34", "fedora-34-libressl", "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", diff --git a/fedora-32-ossl3.docker.m4 b/fedora-32-ossl3.docker.m4 deleted file mode 100644 index 320f963..0000000 --- a/fedora-32-ossl3.docker.m4 +++ /dev/null @@ -1,10 +0,0 @@ -include(`fedora-32.docker.m4') - -# Install openssl3 -RUN dnf remove -y libssl-devel libcurl4-openssl-devel -RUN dnf -y install \ - perl-IPC-Cmd \ - perl-Pod-Html -include(`ossl3.m4') - -WORKDIR / From a91a8a1514fca2707814914cebe380eefe5d05dc Mon Sep 17 00:00:00 2001 From: William Roberts Date: Tue, 13 Dec 2022 19:56:43 -0600 Subject: [PATCH 3/4] fedora-34-libressl: rm as unused in CI Signed-off-by: William Roberts --- .github/workflows/main.yml | 2 +- .github/workflows/publish.yml | 2 +- fedora-34-libressl.docker.m4 | 76 ----------------------------------- 3 files changed, 2 insertions(+), 78 deletions(-) delete mode 100644 fedora-34-libressl.docker.m4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cfaae18..b39c180 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: distro: [ - "fedora-32", "fedora-34", "fedora-34-libressl", + "fedora-32", "fedora-34", "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0cc4e7c..b481a11 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: distro: [ - "fedora-32", "fedora-34", "fedora-34-libressl", + "fedora-32", "fedora-34", "opensuse-leap-15.2", "opensuse-leap", "ubuntu-18.04", "ubuntu-20.04", "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", diff --git a/fedora-34-libressl.docker.m4 b/fedora-34-libressl.docker.m4 deleted file mode 100644 index 76ffbb0..0000000 --- a/fedora-34-libressl.docker.m4 +++ /dev/null @@ -1,76 +0,0 @@ -FROM fedora:34 - -LABEL org.opencontainers.image.source https://github.com/tpm2-software/tpm2-software-container - -# can return 100 if packages need update -RUN dnf check-update; \ - rc=$?; \ - if [ $rc -ne 100 ] && [ $rc -ne 0 ]; then \ - echo "dnf check-update failed: $rc"; \ - exit $rc; \ - fi - -RUN dnf -y install \ - libcmocka \ - libcmocka-devel \ - net-tools \ - git \ - pkg-config \ - gcc \ - m4 \ - libtool \ - automake \ - gnulib \ - glib2-devel \ - wget \ - doxygen \ - dbus-libs \ - dbus-devel \ - clang \ - clang-analyzer \ - clang-tools-extra \ - pandoc \ - lcov \ - libcurl-devel \ - dbus-x11 \ - vim \ - python3-pip \ - libsq3-devel \ - iproute \ - procps \ - libasan \ - libubsan \ - perl-Digest-SHA \ - libtasn1-devel \ - socat \ - libseccomp-devel \ - expect \ - gawk \ - json-c-devel \ - libyaml-devel \ - nss-tools \ - expect \ - opensc \ - java-latest-openjdk \ - java-latest-openjdk-devel \ - gnutls-utils \ - libuuid-devel \ - python3-devel \ - openssl-pkcs11 \ - acl \ - json-glib-devel \ - libusb-devel - -# make install goes into /usr/local/lib/pkgconfig which is non-standard -# Set this so ./configure can find things and we don't have to worry about prefix changes -# to build instructions -ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig - -include(`libressl.m4') -include(`pip3.m4') -include(`autoconf.m4') -include(`swtpm.m4') -include(`uthash.m4') -include(`junit.m4') - -WORKDIR / From 6b67eda5c2cdd2900d289b1dbd088ab6677f58bc Mon Sep 17 00:00:00 2001 From: William Roberts Date: Tue, 13 Dec 2022 20:01:40 -0600 Subject: [PATCH 4/4] ubuntu-20.04-ossl3: rm as unused in CI Signed-off-by: William Roberts --- .github/workflows/main.yml | 2 +- .github/workflows/publish.yml | 2 +- ubuntu-20.04-ossl3.docker.m4 | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 ubuntu-20.04-ossl3.docker.m4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b39c180..2e4bd6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", "fedora-32.ppc64le", "alpine-3.15", - "ubuntu-20.04-ossl3", "ubuntu-22.04", "ubuntu-22.04-mbedtls-3.1" + "ubuntu-22.04", "ubuntu-22.04-mbedtls-3.1" ] steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b481a11..f87dd62 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,7 @@ jobs: "ubuntu-20.04.arm32v7", "ubuntu-20.04.arm64v8", "fedora-32.ppc64le", "alpine-3.15", - "ubuntu-20.04-ossl3", "ubuntu-22.04", "ubuntu-22.04-mbedtls-3.1" + "ubuntu-22.04", "ubuntu-22.04-mbedtls-3.1" ] if: "github.repository_owner == 'tpm2-software'" steps: diff --git a/ubuntu-20.04-ossl3.docker.m4 b/ubuntu-20.04-ossl3.docker.m4 deleted file mode 100644 index 6ccc54a..0000000 --- a/ubuntu-20.04-ossl3.docker.m4 +++ /dev/null @@ -1,7 +0,0 @@ -include(`ubuntu-20.04.docker.m4') - -# Install openssl3 -RUN apt-get remove -y libssl-dev -include(`ossl3.m4') - -WORKDIR /