1 Commits

Author SHA1 Message Date
06cd4f6f51 Update windows-x86-x64.yml 2025-07-09 13:57:23 -05:00

View File

@ -53,23 +53,23 @@ jobs:
- name: Checkout Source Tree - name: Checkout Source Tree
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Cache OpenSSL 3.1.2 (32-bit) - name: Cache OpenSSL 1.1.1 (32-bit)
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
if: matrix.arch == 'x86' if: matrix.arch == 'x86'
id: cache-openssl-32 id: cache-openssl-32
with: with:
path: | path: |
${{ github.workspace }}/OpenSSL-TDM-32 ${{ github.workspace }}/OpenSSL-TDM-32
key: openssl-3.1.2-x86-${{ hashFiles('**/CMakeLists.txt') }} key: openssl-1.1.1-x86-${{ hashFiles('**/CMakeLists.txt') }}
- name: Cache OpenSSL 3.1.2 (64-bit) - name: Cache OpenSSL 1.1.1 (64-bit)
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
if: matrix.arch == 'x64' if: matrix.arch == 'x64'
id: cache-openssl-64 id: cache-openssl-64
with: with:
path: | path: |
${{ github.workspace }}/OpenSSL-TDM-64 ${{ github.workspace }}/OpenSSL-TDM-64
key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }} key: openssl-1.1.1-x64-${{ hashFiles('**/CMakeLists.txt') }}
- name: Setup MSYS2 - name: Setup MSYS2
if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true' if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
@ -84,15 +84,15 @@ jobs:
perl perl
git git
- name: Checkout and Compile OpenSSL 3.1.2 - name: Checkout and Compile OpenSSL 1.1.1
if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true' if: steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true'
shell: msys2 {0} shell: msys2 {0}
run: | run: |
# Clone UMSKT's OpenSSL fork # Clone UMSKT's OpenSSL fork
echo "Cloning UMSKT OpenSSL fork..." echo "Cloning UMSKT OpenSSL fork..."
git clone https://github.com/UMSKT/openssl.git --depth 1 openssl-3.1.2 git clone https://github.com/UMSKT/openssl.git --branch OpenSSL_1_1_1-stable --depth 1 openssl-1.1.1
- name: Checkout and Compile OpenSSL 3.1.2 (32-bit) - name: Checkout and Compile OpenSSL 1.1.1 (32-bit)
if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true' if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true'
shell: msys2 {0} shell: msys2 {0}
run: | run: |
@ -104,7 +104,7 @@ jobs:
export PATH="/c/TDM-GCC-64/bin:$PATH" export PATH="/c/TDM-GCC-64/bin:$PATH"
export MSYSTEM=MINGW32 export MSYSTEM=MINGW32
echo "Compiling 32-bit OpenSSL..." echo "Compiling 32-bit OpenSSL..."
cd openssl-3.1.2 cd openssl-1.1.1
/usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 no-tests no-sse2 no-asm no-threads -DOPENSSL_DEV_NO_ATOMICS -mno-mmx -mno-sse -mno-sse2 -march=i686 -mtune=generic /usr/bin/perl Configure mingw --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-32 no-tests no-sse2 no-asm no-threads -DOPENSSL_DEV_NO_ATOMICS -mno-mmx -mno-sse -mno-sse2 -march=i686 -mtune=generic
mingw32-make -j mingw32-make -j
mingw32-make install_sw mingw32-make install_sw
@ -122,19 +122,19 @@ jobs:
export PATH="/c/TDM-GCC-64/bin:$PATH" export PATH="/c/TDM-GCC-64/bin:$PATH"
export MSYSTEM=MINGW64 export MSYSTEM=MINGW64
echo "Compiling 64-bit OpenSSL..." echo "Compiling 64-bit OpenSSL..."
cd openssl-3.1.2 cd openssl-1.1.1
/usr/bin/perl Configure mingw64 --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 no-tests no-asm -DOPENSSL_DEV_NO_ATOMICS -mno-mmx /usr/bin/perl Configure mingw64 --prefix=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 --openssldir=$(cygpath -u "$GITHUB_WORKSPACE")/OpenSSL-TDM-64 no-tests no-asm -DOPENSSL_DEV_NO_ATOMICS -mno-mmx
mingw32-make -j mingw32-make -j
mingw32-make install_sw mingw32-make install_sw
cd .. cd ..
- name: Save OpenSSL 3.1.2 (32-bit) - name: Save OpenSSL 1.1.1 (32-bit)
if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true' if: matrix.arch == 'x86' && steps.cache-openssl-32.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: | path: |
${{ github.workspace }}/OpenSSL-TDM-32 ${{ github.workspace }}/OpenSSL-TDM-32
key: openssl-3.1.2-x86-${{ hashFiles('**/CMakeLists.txt') }} key: openssl-1.1.1-x86-${{ hashFiles('**/CMakeLists.txt') }}
- name: Save OpenSSL 3.1.2 (64-bit) - name: Save OpenSSL 3.1.2 (64-bit)
if: matrix.arch == 'x64' && steps.cache-openssl-64.outputs.cache-hit != 'true' if: matrix.arch == 'x64' && steps.cache-openssl-64.outputs.cache-hit != 'true'
@ -142,7 +142,7 @@ jobs:
with: with:
path: | path: |
${{ github.workspace }}/OpenSSL-TDM-64 ${{ github.workspace }}/OpenSSL-TDM-64
key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }} key: openssl-1.1.1-x64-${{ hashFiles('**/CMakeLists.txt') }}
- name: Set OpenSSL Environment (32-bit) - name: Set OpenSSL Environment (32-bit)
if: matrix.arch == 'x86' if: matrix.arch == 'x86'
@ -196,4 +196,4 @@ jobs:
uses: actions/upload-artifact@v4.6.2 uses: actions/upload-artifact@v4.6.2
with: with:
name: UMSKT-WinNT-${{ matrix.arch }} name: UMSKT-WinNT-${{ matrix.arch }}
path: umskt.exe path: umskt.exe