-
Notifications
You must be signed in to change notification settings - Fork 389
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into feature/app-update
- Loading branch information
Showing
685 changed files
with
51,160 additions
and
12,391 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,12 +10,16 @@ env: | |
|
|
||
| jobs: | ||
| Build-Linux-Ubuntu: | ||
| name: 'Build-Linux-Ubuntu' | ||
| runs-on: ubuntu-20.04 | ||
|
|
||
| env: | ||
| QT_VERSION: 6.6.2 | ||
| QIF_VERSION: 4.7 | ||
| PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} | ||
| PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }} | ||
| DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} | ||
| DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }} | ||
| DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }} | ||
|
|
||
| steps: | ||
| - name: 'Install Qt' | ||
|
|
@@ -65,16 +69,27 @@ jobs: | |
| path: deploy/AppDir | ||
| retention-days: 7 | ||
|
|
||
| - name: 'Upload translations artifact' | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: AmneziaVPN_translations | ||
| path: client/translations | ||
| retention-days: 7 | ||
|
|
||
| # ------------------------------------------------------ | ||
|
|
||
| Build-Windows: | ||
| name: Build-Windows | ||
| runs-on: windows-latest | ||
|
|
||
| env: | ||
| QT_VERSION: 6.6.2 | ||
| QIF_VERSION: 4.7 | ||
| BUILD_ARCH: 64 | ||
| PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} | ||
| PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }} | ||
| DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} | ||
| DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }} | ||
| DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }} | ||
|
|
||
| steps: | ||
| - name: 'Get sources' | ||
|
|
@@ -130,13 +145,17 @@ jobs: | |
| # ------------------------------------------------------ | ||
|
|
||
| Build-iOS: | ||
| name: 'Build-iOS' | ||
| runs-on: macos-13 | ||
|
|
||
| env: | ||
| QT_VERSION: 6.6.2 | ||
| CC: cc | ||
| CXX: c++ | ||
| PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} | ||
| PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }} | ||
| DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} | ||
| DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }} | ||
| DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }} | ||
|
|
||
| steps: | ||
| - name: 'Setup xcode' | ||
|
|
@@ -171,7 +190,7 @@ jobs: | |
| - name: 'Install go' | ||
| uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: '1.20' | ||
| go-version: '1.22.1' | ||
| cache: false | ||
|
|
||
| - name: 'Setup gomobile' | ||
|
|
@@ -221,13 +240,17 @@ jobs: | |
| # ------------------------------------------------------ | ||
|
|
||
| Build-MacOS: | ||
| name: 'Build-MacOS' | ||
| runs-on: macos-latest | ||
|
|
||
| env: | ||
| # Keep compat with MacOS 10.15 aka Catalina by Qt 6.4 | ||
| QT_VERSION: 6.4.3 | ||
| QIF_VERSION: 4.6 | ||
| PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} | ||
| PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }} | ||
| DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} | ||
| DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }} | ||
| DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }} | ||
|
|
||
| steps: | ||
| - name: 'Setup xcode' | ||
|
|
@@ -286,28 +309,32 @@ jobs: | |
| # ------------------------------------------------------ | ||
|
|
||
| Build-Android: | ||
| name: 'Build-Android' | ||
| runs-on: ubuntu-latest | ||
|
|
||
| env: | ||
| ANDROID_BUILD_PLATFORM: android-34 | ||
| QT_VERSION: 6.6.2 | ||
| QT_VERSION: 6.7.3 | ||
| QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools' | ||
| PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} | ||
| PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }} | ||
| DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} | ||
| DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }} | ||
| DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }} | ||
|
|
||
| steps: | ||
| - name: 'Install desktop Qt' | ||
| uses: jurplel/install-qt-action@v3 | ||
| uses: jurplel/install-qt-action@v4 | ||
| with: | ||
| version: ${{ env.QT_VERSION }} | ||
| host: 'linux' | ||
| target: 'desktop' | ||
| arch: 'gcc_64' | ||
| arch: 'linux_gcc_64' | ||
| modules: ${{ env.QT_MODULES }} | ||
| dir: ${{ runner.temp }} | ||
| extra: '--external 7z --base ${{ env.QT_MIRROR }}' | ||
|
|
||
| - name: 'Install android_x86_64 Qt' | ||
| uses: jurplel/install-qt-action@v3 | ||
| uses: jurplel/install-qt-action@v4 | ||
| with: | ||
| version: ${{ env.QT_VERSION }} | ||
| host: 'linux' | ||
|
|
@@ -318,7 +345,7 @@ jobs: | |
| extra: '--external 7z --base ${{ env.QT_MIRROR }}' | ||
|
|
||
| - name: 'Install android_x86 Qt' | ||
| uses: jurplel/install-qt-action@v3 | ||
| uses: jurplel/install-qt-action@v4 | ||
| with: | ||
| version: ${{ env.QT_VERSION }} | ||
| host: 'linux' | ||
|
|
@@ -329,7 +356,7 @@ jobs: | |
| extra: '--external 7z --base ${{ env.QT_MIRROR }}' | ||
|
|
||
| - name: 'Install android_armv7 Qt' | ||
| uses: jurplel/install-qt-action@v3 | ||
| uses: jurplel/install-qt-action@v4 | ||
| with: | ||
| version: ${{ env.QT_VERSION }} | ||
| host: 'linux' | ||
|
|
@@ -340,7 +367,7 @@ jobs: | |
| extra: '--external 7z --base ${{ env.QT_MIRROR }}' | ||
|
|
||
| - name: 'Install android_arm64_v8a Qt' | ||
| uses: jurplel/install-qt-action@v3 | ||
| uses: jurplel/install-qt-action@v4 | ||
| with: | ||
| version: ${{ env.QT_VERSION }} | ||
| host: 'linux' | ||
|
|
@@ -432,3 +459,21 @@ jobs: | |
| path: deploy/build/AmneziaVPN-release.aab | ||
| compression-level: 0 | ||
| retention-days: 7 | ||
|
|
||
| Extra: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Search a corresponding PR | ||
| uses: octokit/[email protected] | ||
| id: pull_request | ||
| with: | ||
| route: GET /repos/${{ github.repository }}/pulls | ||
| head: ${{ github.repository_owner }}:${{ github.ref_name }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Add PR link to build summary | ||
| if: ${{ fromJSON(steps.pull_request.outputs.data)[0].number != '' }} | ||
| run: | | ||
| echo "Pull request:" >> $GITHUB_STEP_SUMMARY | ||
| echo "[[#${{ fromJSON(steps.pull_request.outputs.data)[0].number }}] ${{ fromJSON(steps.pull_request.outputs.data)[0].title }}](${{ fromJSON(steps.pull_request.outputs.data)[0].html_url }})" >> $GITHUB_STEP_SUMMARY | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule 3rd-prebuilt
updated
74 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| *.user | ||
| build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| cmake_minimum_required(VERSION 3.5) | ||
|
|
||
| project(QJsonStruct LANGUAGES CXX) | ||
|
|
||
| set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||
| set(CMAKE_AUTOMOC ON) | ||
| set(CMAKE_AUTORCC ON) | ||
| set(CMAKE_CXX_STANDARD 17) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
|
||
| option(BUILD_TESTING ON) | ||
|
|
||
| include(QJsonStruct.cmake) | ||
| find_package(Qt5 COMPONENTS Core REQUIRED) | ||
|
|
||
| if(BUILD_TESTING) | ||
| include(CTest) | ||
| add_subdirectory(test) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| MIT License | ||
|
|
||
| Copyright (c) 2020 Qv2ray Workgroup | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
Oops, something went wrong.