@@ -368,18 +368,24 @@ jobs:
368368
369369 echo "Organizing packages..."
370370
371- # For Jenkins builds: packages come from downloaded-packages directory
372- if [ "${{ inputs.use_cached_packages }}" = "false" ]; then
373- echo "Copying packages from Jenkins build (downloaded-packages/)..."
371+ # dpkg-buildpackage always outputs to parent directory (..)
372+ # This happens for both Jenkins builds and cached builds
373+ echo "Copying packages from Debian build output (../)..."
374+ ls -la ../*.deb 2>/dev/null || echo "No .deb files in parent directory"
375+
376+ # Copy OpenSSL packages
377+ cp ../openssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/ 2>/dev/null || true
378+ cp ../libssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/ 2>/dev/null || true
379+
380+ # Copy wolfProvider packages
381+ cp ../libwolfprov*.deb ${{ env.WOLFPROV_PACKAGES_PATH }}/ 2>/dev/null || true
382+
383+ # Also check downloaded-packages for Jenkins builds (as fallback)
384+ if [ "${{ inputs.use_cached_packages }}" = "false" ] && [ -d "./downloaded-packages" ]; then
385+ echo "Also checking downloaded-packages directory..."
374386 cp ./downloaded-packages/openssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/ 2>/dev/null || true
375387 cp ./downloaded-packages/libssl*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/ 2>/dev/null || true
376388 cp ./downloaded-packages/libwolfprov*.deb ${{ env.WOLFPROV_PACKAGES_PATH }}/ 2>/dev/null || true
377- else
378- # For cached builds: dpkg-buildpackage outputs to parent directory
379- echo "Copying packages from Debian build (../)..."
380- cp ../*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/ 2>/dev/null || true
381- # Move wolfProvider packages specifically
382- mv ${{ env.OPENSSL_PACKAGES_PATH }}/libwolfprov*.deb ${{ env.WOLFPROV_PACKAGES_PATH }}/ 2>/dev/null || true
383389 fi
384390
385391 echo ""
0 commit comments