andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: bump apple hev-socks5-tunnel dep (#2624)

Browse Source 
* chore(conan): bump hev-socks5-tunnel

* chore(conan): bump xcode-versions

* chore(conan): upload prebuilts only in case of pushing to dev
This commit is contained in:
Yaroslav Gurov
2026-05-20 14:31:35 +02:00
committed by GitHub
parent b29515c380
commit fbe15d965b
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yml
+15 -3
View File
@@ -50,9 +50,11 @@ jobs:
done done
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
@@ -155,9 +157,11 @@ jobs:
run: cmake -S . -B build -G "Visual Studio 17 2022" -DPREBUILTS_ONLY=1 run: cmake -S . -B build -G "Visual Studio 17 2022" -DPREBUILTS_ONLY=1
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
@@ -262,7 +266,7 @@ jobs:
strategy: strategy:
matrix: matrix:
xcode-version: [26.0] xcode-version: [26.0, 26.4]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -285,9 +289,11 @@ jobs:
run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
@@ -344,7 +350,7 @@ jobs:
- name: 'Setup xcode' - name: 'Setup xcode'
uses: maxim-lobanov/setup-xcode@v1 uses: maxim-lobanov/setup-xcode@v1
with: with:
xcode-version: '26.1' xcode-version: '26.4'
- name: 'Install desktop Qt' - name: 'Install desktop Qt'
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
@@ -401,7 +407,7 @@ jobs:
strategy: strategy:
matrix: matrix:
xcode-version: [16.2, 16.4] xcode-version: [16.2, 16.4, 26.4]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -424,9 +430,11 @@ jobs:
run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1 run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
@@ -554,9 +562,11 @@ jobs:
run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1 -DMACOS_NE=TRUE run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1 -DMACOS_NE=TRUE
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
@@ -696,9 +706,11 @@ jobs:
done done
- name: 'Authorize in remote' - name: 'Authorize in remote'
if: github.ref == 'refs/heads/dev'
run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}" run: conan remote login amnezia "${{ secrets.CONAN_USER }}" -p "${{ secrets.CONAN_PASSWORD }}"
- name: 'Upload baked prebuilts' - name: 'Upload baked prebuilts'
if: github.ref == 'refs/heads/dev'
run: conan upload -r amnezia "*" -c run: conan upload -r amnezia "*" -c
# ------------------------------------------------------ # ------------------------------------------------------
conanfile.py
+1 -1
View File
@@ -33,7 +33,7 @@ class AmneziaVPN(ConanFile):
if has_ne: if has_ne:
self.requires("awg-apple/2.0.1") self.requires("awg-apple/2.0.1")
self.requires("hev-socks5-tunnel/2.14.4", options={"as_framework": True}) self.requires("hev-socks5-tunnel/2.15.0", options={"as_framework": True})
self.requires("openvpnadapter/1.0.0") self.requires("openvpnadapter/1.0.0")
if os == "Android": if os == "Android":
recipes/hev-socks5-tunnel/conanfile.py
+1 -1
View File
@@ -15,7 +15,7 @@ required_conan_version = ">=2.26"
class HevSocks5Tunnel(ConanFile): class HevSocks5Tunnel(ConanFile):
name = "hev-socks5-tunnel" name = "hev-socks5-tunnel"
version = "2.14.4" version = "2.15.0"
settings = "os", "arch", "compiler" settings = "os", "arch", "compiler"
options = { options = {
"shared": [True, False], "shared": [True, False],