Skip to content

Commit ccfb076

Browse files
committed
feat: add support arm64 [windows-libssh]
1 parent 199ec07 commit ccfb076

File tree

3 files changed

+38
-3
lines changed

3 files changed

+38
-3
lines changed

.github/workflows/build_awg_windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
mkdir build
2828
move x64 build\x64
2929
move x86 build\x86
30+
move arm64 build\arm64
3031
3132
- name: 'Archive artifacts'
3233
uses: actions/upload-artifact@v4

.github/workflows/build_libssh_windows.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
contains(github.event.head_commit.message, '[libssh]')
2222
strategy:
2323
matrix:
24-
arch: [x86, x86_64]
24+
arch: [x86, x86_64, arm64]
2525
# no-crypto=yes: builds version with all crypto disabled
2626
# no-crypto=no: builds version with all crypto enabled (where required dependencies are available)
2727
no_crypto:
@@ -35,7 +35,7 @@ jobs:
3535
# uses: ilammy/msvc-dev-cmd@d8610e2b41c6d0f0c3b4c46dad8df0fd826c68e1
3636
uses: ilammy/[email protected]
3737
with:
38-
arch: ${{ matrix.arch }}
38+
arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || matrix.arch }}
3939
toolset: ${{ matrix.toolset }}
4040
#sdk: # use the latest
4141
#spectre: # set true to use VC libraries with sepctre mitigations
@@ -114,6 +114,16 @@ jobs:
114114
perl Configure VC-WIN64A no-tests no-shared --with-zlib-include=${{github.workspace}}\zlib\${{env.ZLIB_VERSION}}
115115
nmake
116116
117+
- name: Build openssl ARM64
118+
if: matrix.arch == 'arm64'
119+
shell: powershell
120+
run: |
121+
cd openssl\${{env.OPENSSL_VERSION}}
122+
$env:Path += ";${{github.workspace}}\tools\nasm"
123+
$env:Path
124+
perl Configure VC-WIN64-ARM no-tests no-shared --with-zlib-include=${{github.workspace}}\zlib\${{env.ZLIB_VERSION}}
125+
nmake
126+
117127
- name: Build libssh
118128
shell: powershell
119129
run: |
@@ -122,7 +132,7 @@ jobs:
122132
nmake ssh
123133
124134
- name: Upload Artifact
125-
uses: actions/upload-artifact@v2.2.4
135+
uses: actions/upload-artifact@v4
126136
with:
127137
name: libssh-win-${{ matrix.arch }}
128138
path: ${{ github.workspace }}\libssh\${{env.LIBSSH_VERSION}}\build

.github/workflows/build_openssl_windows.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
arch:
1818
- amd64
1919
- amd64_x86
20+
- amd64_arm64
2021
shared:
2122
- shared
2223
- no-shared
@@ -83,6 +84,29 @@ jobs:
8384
mkdir build/win64
8485
move libcrypto-3-x64.dll build/win64
8586
move libssl-3-x64.dll build/win64
87+
- name: Build OpenSSL ARM64
88+
if: matrix.arch == 'amd64_arm64' && matrix.shared == 'no-shared'
89+
run: |
90+
cd openssl
91+
92+
perl Configure no-tests no-shared VC-WIN64-ARM
93+
nmake
94+
mkdir build
95+
mkdir build/arm64
96+
move libcrypto.lib build/arm64
97+
move libssl.lib build/arm64
98+
move include build/include
99+
- name: Build Shared OpenSSL ARM64
100+
if: matrix.arch == 'amd64_arm64' && matrix.shared == 'shared'
101+
run: |
102+
cd openssl
103+
104+
perl Configure no-tests VC-WIN64-ARM
105+
nmake
106+
mkdir build
107+
mkdir build/arm64
108+
move libcrypto-3-arm64.dll build/arm64
109+
move libssl-3-arm64.dll build/arm64
86110
- name: Archive Windows OpenSSL libs
87111
uses: actions/upload-artifact@v4
88112
with:

0 commit comments

Comments
 (0)