mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ea9d1458a0 | |||
| 52c0374c8d | |||
| 0f35fdebe3 | |||
| efaab07eb6 |
@@ -18,7 +18,6 @@ jobs:
|
|||||||
- uses: dorny/paths-filter@v3
|
- uses: dorny/paths-filter@v3
|
||||||
id: filter
|
id: filter
|
||||||
with:
|
with:
|
||||||
base: ${{ github.event.before }}
|
|
||||||
filters: |
|
filters: |
|
||||||
recipes:
|
recipes:
|
||||||
- 'recipes/**'
|
- 'recipes/**'
|
||||||
@@ -40,7 +39,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build dependencies'
|
- name: 'Build dependencies'
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -100,7 +99,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Install system packages'
|
- name: 'Install system packages'
|
||||||
run: sudo apt-get install libxkbcommon-x11-0 libsecret-1-dev
|
run: sudo apt-get install libxkbcommon-x11-0 libsecret-1-dev
|
||||||
@@ -151,7 +150,7 @@ jobs:
|
|||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build dependencies'
|
- name: 'Build dependencies'
|
||||||
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
|
||||||
@@ -233,7 +232,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build project'
|
- name: 'Build project'
|
||||||
shell: cmd
|
shell: cmd
|
||||||
@@ -260,13 +259,17 @@ jobs:
|
|||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Bake-Prebuilts-iOS:
|
Bake-Prebuilts-iOS:
|
||||||
runs-on: macos-latest
|
|
||||||
needs: Detect-Changes
|
needs: Detect-Changes
|
||||||
if: needs.Detect-Changes.outputs.recipes_changed == 'true'
|
if: needs.Detect-Changes.outputs.recipes_changed == 'true'
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode-version: [26.0, 26.4]
|
xcode-version: [26.0, 26.4]
|
||||||
|
include:
|
||||||
|
- xcode-version: 26.4
|
||||||
|
os: macos-26
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os || 'macos-latest' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -283,7 +286,7 @@ jobs:
|
|||||||
xcode-version: ${{ matrix.xcode-version }}
|
xcode-version: ${{ matrix.xcode-version }}
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build dependencies'
|
- name: 'Build dependencies'
|
||||||
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
|
||||||
@@ -350,7 +353,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.4'
|
xcode-version: '26.0'
|
||||||
|
|
||||||
- name: 'Install desktop Qt'
|
- name: 'Install desktop Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v3
|
||||||
@@ -382,7 +385,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install deps'
|
- name: 'Install deps'
|
||||||
run: pip install "conan==2.26.2" jsonschema jinja2
|
run: pip install "conan==2.28.0" jsonschema jinja2
|
||||||
|
|
||||||
- name: 'Build project'
|
- name: 'Build project'
|
||||||
env:
|
env:
|
||||||
@@ -400,14 +403,17 @@ jobs:
|
|||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Bake-Prebuilts-MacOS:
|
Bake-Prebuilts-MacOS:
|
||||||
runs-on: macos-latest
|
|
||||||
|
|
||||||
needs: Detect-Changes
|
needs: Detect-Changes
|
||||||
if: needs.Detect-Changes.outputs.recipes_changed == 'true'
|
if: needs.Detect-Changes.outputs.recipes_changed == 'true'
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode-version: [16.2, 16.4, 26.4]
|
xcode-version: [16.2, 16.4, 26.4]
|
||||||
|
include:
|
||||||
|
- xcode-version: 26.4
|
||||||
|
os: macos-26
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os || 'macos-latest' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -424,7 +430,7 @@ jobs:
|
|||||||
xcode-version: ${{ matrix.xcode-version }}
|
xcode-version: ${{ matrix.xcode-version }}
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build dependencies'
|
- name: 'Build dependencies'
|
||||||
run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1
|
run: cmake -S . -B build -G Xcode -DPREBUILTS_ONLY=1
|
||||||
@@ -510,7 +516,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build project'
|
- name: 'Build project'
|
||||||
env:
|
env:
|
||||||
@@ -556,7 +562,7 @@ jobs:
|
|||||||
xcode-version: ${{ matrix.xcode-version }}
|
xcode-version: ${{ matrix.xcode-version }}
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build dependencies'
|
- name: 'Build dependencies'
|
||||||
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
|
||||||
@@ -645,7 +651,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Build project'
|
- name: 'Build project'
|
||||||
run: |
|
run: |
|
||||||
@@ -681,7 +687,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Setup Android SDK'
|
- name: 'Setup Android SDK'
|
||||||
uses: android-actions/setup-android@v4
|
uses: android-actions/setup-android@v4
|
||||||
@@ -818,7 +824,7 @@ jobs:
|
|||||||
python-version: 3.14
|
python-version: 3.14
|
||||||
|
|
||||||
- name: 'Install conan'
|
- name: 'Install conan'
|
||||||
run: pip install "conan==2.26.2"
|
run: pip install "conan==2.28.0"
|
||||||
|
|
||||||
- name: 'Decode keystore secret to file'
|
- name: 'Decode keystore secret to file'
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from conan import ConanFile
|
|||||||
from conan.tools.files import get, copy
|
from conan.tools.files import get, copy
|
||||||
from conan.tools.layout import basic_layout
|
from conan.tools.layout import basic_layout
|
||||||
from conan.errors import ConanInvalidConfiguration
|
from conan.errors import ConanInvalidConfiguration
|
||||||
from conan.tools.env import VirtualBuildEnv, Environment
|
from conan.tools.env import Environment
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import stat
|
import stat
|
||||||
@@ -34,7 +34,6 @@ class AmneziaLibxray(ConanFile):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def generate(self):
|
def generate(self):
|
||||||
VirtualBuildEnv(self).generate()
|
|
||||||
env = Environment()
|
env = Environment()
|
||||||
ndk_path_str = self.conf.get("tools.android:ndk_path")
|
ndk_path_str = self.conf.get("tools.android:ndk_path")
|
||||||
if ndk_path_str:
|
if ndk_path_str:
|
||||||
|
|||||||
Reference in New Issue
Block a user