Update build.yml

.github/workflows/build.yml

@@ -115,7 +115,7 @@ jobs:
         with:
           path: |
             cache.tar.xz
-          key: gam-${{ matrix.jid }}-20240828
+          key: gam-${{ matrix.jid }}-20240903
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@@ -353,8 +353,7 @@ jobs:
       - name: Run OpenSSL
         if: matrix.goal == 'build'
         run: |
-          "${OPENSSL_INSTALL_PATH}/bin/openssl" version
-          "${OPENSSL_INSTALL_PATH}/bin/openssl" version -f
+          "${OPENSSL_INSTALL_PATH}/bin/openssl" version -a
           file "${OPENSSL_INSTALL_PATH}/bin/openssl"
 
       - name: Get latest stable Python source
@@ -450,6 +449,7 @@ jobs:
       - name: Run Python
         run: |
           "${PYTHON}" -V
+          "${PYTHON}" -c "import ssl; print(f'Using {ssl.OPENSSL_VERSION}')"
 
       - name: Upgrade pip, wheel, etc
         run: |
@@ -530,6 +530,8 @@ jobs:
           fi
           mkdir -p -v "${gampath}"
           if [[ "${RUNNER_OS}" == "macOS" ]]; then
+            # brew OpenSSL gets picked up by PyInstaller breaking our self-compiled version
+            brew uninstall --ignore-dependencies openssl
             export gampath=$($PYTHON -c "import os; print(os.path.realpath('$gampath'))")
           elif [[ "${RUNNER_OS}" == "Windows" ]]; then
             # Work around issue where PyInstaller picks up python3.dll from other Python versions
@@ -545,13 +547,18 @@ jobs:
           export distpath="./dist/gam"
           export gampath="${distpath}"
           "${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec
+          echo "WARNINGS FROM build/gam/warn-gam.txt"
           cat build/gam/warn-gam.txt
+          echo "Analysis FROM build/gam/Analysis-00.toc"
+          cat build/gam/Analysis-00.toc
+          echo "EXE data FROM build/gam/EXE-00.toc"
+          cat build/gam/EXE-00.toc
           if [ -x "$(command -v realpath)" ]; then
                realpath=realpath
-             else
+          else
                brew install coreutils
                realpath=grealpath
-             fi
+          fi
           export gam=$(realpath "$gam")
           if [[ "${RUNNER_OS}" == "Windows" ]]; then
             export gam=$(cygpath -w "$gam")

src/gam.spec

@@ -21,6 +21,7 @@ hiddenimports = [
      'gam.gamlib.yubikey',
      ]
 
+print(f"datas before analysis:\n{datas}")
 a = Analysis(
     ['gam/__main__.py'],
     pathex=[],
@@ -36,10 +37,12 @@ a = Analysis(
     cipher=None,
     noarchive=False,
     )
+print(f"datas from analysis:\n{a.datas}")
 for d in a.datas:
     if 'pyconfig' in d[0]:
         a.datas.remove(d)
         break
+print(f"datas after pyconfig cleanup:\n{a.datas}")
 pyz = PYZ(a.pure,
           a.zipped_data,
           cipher=None)