From bb35ef70cc4cb5aeaaefd18fa894be7c18263853 Mon Sep 17 00:00:00 2001
From: Joe Birr-Pixton <jpixton@gmail.com>
Date: Tue, 13 Aug 2024 14:44:42 +0100
Subject: [PATCH] Build packages to release in CI

While fedora-40 packages built on ubuntu-24 appear to work,
it seems like that is only accidental.

Instead, build the distribution packages in the matching
container.
---
 .github/workflows/libssl.yaml | 65 +++++++++++++++++++++++++++++++++++
 rustls-libssl/Makefile        |  5 +--
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/libssl.yaml b/.github/workflows/libssl.yaml
index 2f21355..0b5211e 100644
--- a/.github/workflows/libssl.yaml
+++ b/.github/workflows/libssl.yaml
@@ -200,3 +200,68 @@ jobs:
 
       - name: Test packages
         run: make test-package PROFILE=release
+
+  release_packages:
+    name: Produce release packages
+    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}:${{ matrix.version }}
+    strategy:
+      matrix:
+        include:
+          - container: fedora
+            version: 40
+            package: rpm
+          - container: ubuntu
+            version: 24.04
+            package: deb
+        # nb. ubuntu:22.04 has a too-old golang to build nfpm
+        # we could install an upstream golang if we want to
+        # package there.
+
+    steps:
+      - name: Install prerequisites (apt)
+        if: matrix.package == 'deb'
+        working-directory: /
+        run: |
+          apt-get update
+          apt-get install -y curl build-essential git
+
+      - name: Install prerequisites (yum)
+        if: matrix.package == 'rpm'
+        working-directory: /
+        run: |
+          yum install -y curl make automake gcc gcc-c++ kernel-devel git
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Install stable rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install build dependencies (apt)
+        if: matrix.package == 'deb'
+        run: |
+          apt-get update
+          apt-get install -y openssl libssl3 libssl-dev lld golang-go
+          cargo install cargo-get
+          go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
+
+      - name: Install build dependencies (yum)
+        if: matrix.package == 'rpm'
+        run: |
+          yum install -y openssl openssl-devel lld go
+          cargo install cargo-get
+          go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
+
+      - name: Build package
+        run: |
+          make package-${{ matrix.package }} PROFILE=release NFPM=$HOME/go/bin/nfpm
+
+      - name: Archive package
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.package }} package built on ${{ matrix.container }} ${{ matrix.version }}
+          path: rustls-libssl/target/dist/*.${{ matrix.package }}
+          if-no-files-found: error
diff --git a/rustls-libssl/Makefile b/rustls-libssl/Makefile
index 84298d0..728d7c2 100644
--- a/rustls-libssl/Makefile
+++ b/rustls-libssl/Makefile
@@ -1,4 +1,5 @@
 CARGO ?= cargo
+NFPM ?= nfpm
 CARGOFLAGS += --locked
 
 CFLAGS := -Werror -Wall -Wextra -Wpedantic -g $(shell pkg-config --cflags openssl)
@@ -73,13 +74,13 @@ package-deb: dist/nfpm.yaml target/release/libssl.so.3 target/VERSION
 	mkdir --parents target/dist
 	env VERSION=$(shell $(CARGO) get package.version) \
 	    VERSION_PRERELEASE=$(shell $(CARGO) get package.version --pre) \
-	    nfpm package --config $< --target target/dist --packager deb
+	    $(NFPM) package --config $< --target target/dist --packager deb
 
 package-rpm: dist/nfpm.yaml target/release/libssl.so.3 target/VERSION
 	mkdir --parents target/dist
 	env VERSION=$(shell $(CARGO) get package.version) \
 	    VERSION_PRERELEASE=$(shell $(CARGO) get package.version --pre) \
-	    nfpm package --config $< --target target/dist --packager rpm
+	    $(NFPM) package --config $< --target target/dist --packager rpm
 
 target/VERSION: ALWAYS
 	echo "This is rustls-libssl `git describe --always`\nDate: `date`\nIncorporating:" > $@