Test Freebsd

cargo-prebuilt · Dec 23, 2023 · 96129cf · 96129cf
1 parent 7e515b7
commit 96129cf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/cross-openssl.yml b/.github/workflows/cross-openssl.yml
@@ -81,6 +81,7 @@ jobs:
           file: ./cross-openssl/Dockerfile
           pull: true
           push: ${{ github.event_name != 'pull_request' }}
+          load: ${{ github.event_name == 'pull_request' }}
           tags: ghcr.io/cargo-prebuilt/cross-openssl:${{ matrix.target }}
           labels: |
             tech.harmless.cargo-prebuilt.name="cross-openssl"
@@ -96,3 +97,14 @@ jobs:
             BUILD_COMBO=${{ matrix.build_combo }}
           platforms: linux/amd64
           builder: ${{ steps.buildx.outputs.name }}
+      - name: Install cargo-prebuilt
+        uses: cargo-prebuilt/cargo-prebuilt-action@v3
+        with:
+          pkgs: cross
+      - name: Test
+        working-directory: ./cross-openssl
+        run: |
+          set -euxo pipefail
+          git clone --depth=1 https://github.com/cargo-prebuilt/cargo-prebuilt.git
+          cd cargo-prebuilt
+          cross build --target ${{ matrix.target }} --no-default-features --features default-native
diff --git a/cross-openssl/Dockerfile b/cross-openssl/Dockerfile
@@ -13,12 +13,12 @@ RUN --mount=type=bind,source=openssl,target=/openssl,rw <<EOT
     cd /openssl
 
     case "$CROSS_TOOLCHAIN_PREFIX" in
-        *freebsd*)
-            CC="$CROSS_TOOLCHAIN_PREFIX"gcc AR="$CROSS_TOOLCHAIN_PREFIX"ar ./Configure $BUILD_COMBO \
-                --libdir=lib --prefix=/usr/local --openssldir=/usr/local/ssl \
-                no-dso no-shared no-ssl3 no-tests no-comp \
-                no-legacy no-camellia no-idea no-seed
-            ;;
+#         *freebsd*)
+#             CC="$CROSS_TOOLCHAIN_PREFIX"gcc AR="$CROSS_TOOLCHAIN_PREFIX"ar ./Configure $BUILD_COMBO \
+#                 --libdir=lib --prefix=/usr/local --openssldir=/usr/local/ssl \
+#                 no-dso no-shared no-ssl3 no-tests no-comp \
+#                 no-legacy no-camellia no-idea no-seed
+#             ;;
         *)
             CC="$CROSS_TOOLCHAIN_PREFIX"gcc AR="$CROSS_TOOLCHAIN_PREFIX"ar ./Configure $BUILD_COMBO \
                 --libdir=lib --prefix=$CROSS_SYSROOT --openssldir=$CROSS_SYSROOT/ssl \