Skip to content

Commit 1d92adf

Browse files
outspaceoutspace
authored
Merge branch 'master' into bugfix/macos-libssh
2 parents bee5381 + 481caed commit 1d92adf

12 files changed

+156
-25
lines changed

‎.github/workflows/build_awg_android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@v4
3838
with:
3939
repository: amnezia-vpn/amneziawg-android
40-
ref: master
40+
ref: v1.1.3
4141
path: android/amneziawg-android
4242
submodules: true
4343

‎.github/workflows/build_awg_ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66

77
Build-WG-iOS:
88
name: 'AmneziaWG for iOS'
9-
runs-on: macos-12
9+
runs-on: macos-13
1010
if: |
1111
contains(github.event.head_commit.message, '[all]') ||
1212
contains(github.event.head_commit.message, '[ios]') ||
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
repository: amnezia-vpn/amneziawg-apple
34-
ref: feature/xray-merge
34+
ref: v1.0.0
3535
path: awg-apple
3636

3737
- name: 'Build WG'

‎.github/workflows/build_awg_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66

77
Build-AWG-Linux:
88
name: 'AmneziaWG for Linux'
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
if: |
1111
contains(github.event.head_commit.message, '[all]') ||
1212
contains(github.event.head_commit.message, '[linux]') ||
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020
with:
2121
repository: amnezia-vpn/amneziawg-go
22-
ref: master
22+
ref: v0.2.13
2323
path: amneziawg-go
2424

2525
- name: 'Run build script'

‎.github/workflows/build_awg_macos.yml‎

Lines changed: 68 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66

77
Build-AWG-MacOS:
88
name: 'AmneziaWG for MacOS'
9-
runs-on: macos-11
9+
runs-on: macos-13
1010
if: |
1111
contains(github.event.head_commit.message, '[all]') ||
1212
contains(github.event.head_commit.message, '[macos]') ||
@@ -19,9 +19,15 @@ jobs:
1919
uses: actions/checkout@v4
2020
with:
2121
repository: amnezia-vpn/amneziawg-go
22-
ref: master
22+
ref: v0.2.13
2323
path: amneziawg-go
2424

25+
- name: 'Setup Go'
26+
uses: actions/setup-go@v4
27+
with:
28+
go-version: 1.24.4
29+
cache-dependency-path: go.sum
30+
2531
- name: 'Run build script'
2632
working-directory: amneziawg-go
2733
run: |
@@ -31,12 +37,62 @@ jobs:
3137
- name: 'Archive artifacts'
3238
uses: actions/upload-artifact@v4
3339
with:
34-
name: awg-macos
40+
name: awg-macos-binary
3541
path: amneziawg-go/amneziawg-go
3642

43+
Build-AWG-macOS-NE:
44+
name: 'AmneziaWG for MacOS NE'
45+
runs-on: macos-13
46+
if: |
47+
contains(github.event.head_commit.message, '[all]') ||
48+
contains(github.event.head_commit.message, '[macos]') ||
49+
contains(github.event.head_commit.message, '[macos-awg]') ||
50+
contains(github.event.head_commit.message, '[macos-awg-ne]') ||
51+
contains(github.event.head_commit.message, '[awg]')
52+
53+
steps:
54+
- name: 'Get AmneziaWG'
55+
uses: actions/checkout@v4
56+
with:
57+
repository: amnezia-vpn/amneziawg-apple
58+
ref: v1.0.0
59+
path: amneziawg-apple
60+
61+
- name: 'Setup Go'
62+
uses: actions/setup-go@v4
63+
with:
64+
go-version: 1.24.4
65+
cache-dependency-path: go.sum
66+
67+
- name: 'Run build script'
68+
working-directory: amneziawg-apple/Sources/WireGuardKitGo
69+
run: |
70+
make build
71+
72+
- name: 'Verify fat binary for libwg-go.a'
73+
working-directory: amneziawg-apple/Sources/WireGuardKitGo/out
74+
run: |
75+
if [ ! -f libwg-go.a ]; then
76+
echo "Error: libwg-go.a not found!"
77+
exit 1
78+
fi
79+
info=$(lipo -info libwg-go.a)
80+
echo "$info"
81+
if [[ "$info" != *"x86_64"* || "$info" != *"arm64"* ]]; then
82+
echo "Error: libwg-go.a is not a fat (universal) binary."
83+
exit 1
84+
fi
85+
86+
- name: 'Archive artifacts'
87+
uses: actions/upload-artifact@v4
88+
with:
89+
name: awg-macos-libwg
90+
path: amneziawg-apple/Sources/WireGuardKitGo/out/libwg-go.a
91+
92+
3793
github-release:
3894
name: GitHub Release
39-
needs: Build-AWG-MacOS
95+
needs: [Build-AWG-MacOS, Build-AWG-macOS-NE]
4096
runs-on: ubuntu-latest
4197
if: startsWith(github.ref, 'refs/tags/')
4298

@@ -48,16 +104,21 @@ jobs:
48104
uses: actions/download-artifact@v4
49105

50106
- name: Setup | Checksums
51-
run: for file in $(find ./ -name '*' ); do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
107+
run: |
108+
for file in awg-macos-libwg/libwg-go.a awg-macos-binary/amneziawg-go; do
109+
openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"
110+
done
52111
53112
- name: Zip ALL
54-
run: for file in *; do zip -r ${file%.*}.zip $file; done
113+
run: |
114+
zip -j libwg-go.a.zip awg-macos-libwg/libwg-go.a awg-macos-libwg/libwg-go.a.sha256
115+
zip -j amneziawg-go.zip awg-macos-binary/amneziawg-go awg-macos-binary/amneziawg-go.sha256
55116
56117
- name: Upload binaries to release
57118
uses: svenstaro/upload-release-action@v2
58119
with:
59120
repo_token: ${{ secrets.GITHUB_TOKEN }}
60-
file: awg-macos.zip
121+
file: "*.zip"
61122
tag: ${{ github.ref }}
62123
overwrite: true
63124
file_glob: true

‎.github/workflows/build_awg_windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v4
1818
with:
1919
repository: amnezia-vpn/amneziawg-windows
20-
ref: master
20+
ref: v0.1.5
2121
path: windows/wireguard-windows
2222

2323
- name: 'Build WireGuard binary'

‎.github/workflows/build_libssh_ios.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
Build-LibSSH-MacOS:
16-
runs-on: macos-12
16+
runs-on: macos-13
1717
if: |
1818
contains(github.event.head_commit.message, '[all]') ||
1919
contains(github.event.head_commit.message, '[ios]') ||

‎.github/workflows/build_openssl_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on: [push]
66
jobs:
77
Build-Libs-Linux-Ubuntu:
88
name: 'Build-Libs-Linux-Ubuntu'
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
if: |
1111
contains(github.event.head_commit.message, '[all]') ||
1212
contains(github.event.head_commit.message, '[linux]') ||

‎.github/workflows/build_openssl_macos_ios.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
ssllib: [ 3.0.13 ]
1212

13-
runs-on: macos-12
13+
runs-on: macos-13
1414
if: |
1515
contains(github.event.head_commit.message, '[all]') ||
1616
contains(github.event.head_commit.message, '[macos]') ||

‎.github/workflows/build_openvpn_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push]
55
jobs:
66
Build-OpenVPN-Linux:
77
name: 'Build-OpenVPN-Ubuntu'
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-24.04
99
if: |
1010
contains(github.event.head_commit.message, '[all]') ||
1111
contains(github.event.head_commit.message, '[linux]') ||
@@ -122,7 +122,7 @@ jobs:
122122

123123
Build-OpenVPN3-Linux:
124124
name: 'Build-OpenVPN3-Ubuntu'
125-
runs-on: ubuntu-20.04
125+
runs-on: ubuntu-24.04
126126

127127
if: |
128128
contains(github.event.head_commit.message, '[all]') ||

‎.github/workflows/build_openvpn_macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
ssllib: [ openssl30 ]
1212
build: [ normal, asan ]
13-
os: [macos-11, macos-12]
13+
os: [macos-13]
1414
arch: [x86_64] #, arm64]
1515
include:
1616
- build: asan
@@ -144,7 +144,7 @@ jobs:
144144
strategy:
145145
fail-fast: false
146146
matrix:
147-
os: [macos-12]
147+
os: [macos-13]
148148
arch: [x86_64] #, arm64]
149149

150150

0 commit comments

Comments
 (0)