Add the correct path names

Author: Test User

.github/workflows/build-wolfprovider.yml

@@ -21,12 +21,11 @@ jobs:
   build_wolfprovider_common:
     name: Build wolfProvider
     runs-on: ubuntu-22.04
-    # Run inside Debian Bookworm using container from ghcr.io/aidangarske/wolfprovider-build:bookworm
+    # Run inside Debian Bookworm using container from ghcr.io/wolfSSL/build-wolfprovider-debian:bookworm
     # We are using this container to avoid having to install all the dependencies on the host machine 
     # and speed up the build process.
-    # TODO: Switch from aidangarske fork to main WP repo for the build container.
     container:
-      image: ghcr.io/aidangarske/wolfprovider-build:bookworm
+      image: ghcr.io/wolfSSL/build-wolfprovider-debian:bookworm
       env:
         DEBIAN_FRONTEND: noninteractive
       # Add network capabilities so ifconfig/RTNETLINK operations are permitted
@@ -92,21 +91,18 @@ jobs:
           fi
           # Copy OpenSSL packages based on replace_default setting
           if [ "${{ inputs.replace_default }}" = "true" ]; then
-            if [ -d "${{ env.DEBS_PATH }}/openssl/replace-default" ] && [ "$(ls -A ${{ env.DEBS_PATH }}/openssl/replace-default/*.deb 2>/dev/null)" ]; then
+            if [ -d "${{ env.DEBS_PATH }}/openssl/debs-replace-default" ] && [ "$(ls -A ${{ env.DEBS_PATH }}/openssl/debs-replace-default/*.deb 2>/dev/null)" ]; then
               echo "Copying OpenSSL replace-default packages..."
-              cp ${{ env.DEBS_PATH }}/openssl/replace-default/*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/
+              cp ${{ env.DEBS_PATH }}/openssl/debs-replace-default/*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/
             else
               echo "WARNING: No OpenSSL replace-default packages found in debs branch"
             fi
           else
-            if [ -d "${{ env.DEBS_PATH }}/openssl/non-replace-default" ] && [ "$(ls -A ${{ env.DEBS_PATH }}/openssl/non-replace-default/*.deb 2>/dev/null)" ]; then
-              echo "Copying OpenSSL non-replace-default packages..."
-              cp ${{ env.DEBS_PATH }}/openssl/non-replace-default/*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/
-            elif [ -d "${{ env.DEBS_PATH }}/openssl" ] && [ "$(ls -A ${{ env.DEBS_PATH }}/openssl/*.deb 2>/dev/null)" ]; then
-              echo "Copying OpenSSL packages (fallback to openssl/ directory)..."
-              cp ${{ env.DEBS_PATH }}/openssl/*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/
+            if [ -d "${{ env.DEBS_PATH }}/openssl/debs-default" ] && [ "$(ls -A ${{ env.DEBS_PATH }}/openssl/debs-default/*.deb 2>/dev/null)" ]; then
+              echo "Copying OpenSSL default packages..."
+              cp ${{ env.DEBS_PATH }}/openssl/debs-default/*.deb ${{ env.OPENSSL_PACKAGES_PATH }}/
             else
-              echo "WARNING: No OpenSSL packages found in debs branch"
+              echo "WARNING: No OpenSSL default packages found in debs branch"
             fi
           fi