-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #496 from amnezia-vpn/dev
Release 4.2.0.1
- Loading branch information
Showing
324 changed files
with
11,673 additions
and
85,304 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: 'Upload a new version' | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - '[0-9]+.[0-9]+.[0-9]+.[0-9]+' | ||
|
|
||
| jobs: | ||
| upload: | ||
| runs-on: ubuntu-latest | ||
| name: upload | ||
| steps: | ||
| - name: Checkout CMakeLists.txt | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ github.ref_name }} | ||
| sparse-checkout: | | ||
| CMakeLists.txt | ||
| sparse-checkout-cone-mode: false | ||
|
|
||
| - name: Verify git tag | ||
| run: | | ||
| GIT_TAG=${{ github.ref_name }} | ||
| CMAKE_TAG=$(grep 'project.*VERSION' CMakeLists.txt | sed -E 's/.* ([0-9]+.[0-9]+.[0-9]+.[0-9]+)$/\1/') | ||
| if [[ "$GIT_TAG" == "$CMAKE_TAG" ]]; then | ||
| echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are the same. Continuing..." | ||
| else | ||
| echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are not the same! Cancelling..." | ||
| exit 1 | ||
| fi | ||
| - name: Download artifacts from the "${{ github.ref_name }}" tag | ||
| uses: robinraju/release-downloader@v1.8 | ||
| with: | ||
| tag: ${{ github.ref_name }} | ||
| fileName: "AmneziaVPN_(Linux_|)${{ github.ref_name }}*" | ||
| out-file-path: ${{ github.ref_name }} | ||
|
|
||
| - name: Upload beta version | ||
| uses: jakejarvis/s3-sync-action@master | ||
| if: contains(github.event.base_ref, 'dev') | ||
| with: | ||
| args: --include "AmneziaVPN*" --delete | ||
| env: | ||
| AWS_S3_BUCKET: updates | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }} | ||
| AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com | ||
| SOURCE_DIR: ${{ github.ref_name }} | ||
| DEST_DIR: beta/${{ github.ref_name }} | ||
|
|
||
| - name: Upload stable version | ||
| uses: jakejarvis/s3-sync-action@master | ||
| if: contains(github.event.base_ref, 'master') | ||
| with: | ||
| args: --include "AmneziaVPN*" --delete | ||
| env: | ||
| AWS_S3_BUCKET: updates | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }} | ||
| AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com | ||
| SOURCE_DIR: ${{ github.ref_name }} | ||
| DEST_DIR: stable/${{ github.ref_name }} |
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
20 files
Submodule awg-apple
updated
3 files
| +32 −1 | Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift | |
| +1 −0 | Sources/WireGuardKit/PeerConfiguration.swift | |
| +1 −1 | Sources/WireGuardKit/TunnelConfiguration.swift |
Submodule qtkeychain
updated
23 files
| +11 −117 | CMakeLists.txt | |
| +17 −0 | ChangeLog | |
| +1 −1 | QtKeychainConfig.cmake.in | |
| +2 −2 | qtkeychain.pri | |
| +118 −0 | qtkeychain/CMakeLists.txt | |
| +1 −1 | qtkeychain/androidkeystore.cpp | |
| +0 −0 | qtkeychain/androidkeystore_p.h | |
| +0 −0 | qtkeychain/gnomekeyring.cpp | |
| +0 −0 | qtkeychain/gnomekeyring_p.h | |
| +0 −0 | qtkeychain/keychain.cpp | |
| +1 −1 | qtkeychain/keychain.h | |
| +3 −3 | qtkeychain/keychain_android.cpp | |
| +1 −1 | qtkeychain/keychain_apple.mm | |
| +1 −1 | qtkeychain/keychain_haiku.cpp | |
| +0 −0 | qtkeychain/keychain_p.h | |
| +53 −15 | qtkeychain/keychain_unix.cpp | |
| +1 −1 | qtkeychain/keychain_win.cpp | |
| +0 −0 | qtkeychain/libsecret.cpp | |
| +0 −0 | qtkeychain/libsecret_p.h | |
| +0 −0 | qtkeychain/org.kde.KWallet.xml | |
| +0 −0 | qtkeychain/plaintextstore.cpp | |
| +0 −0 | qtkeychain/plaintextstore_p.h | |
| +1 −1 | testclient.cpp |
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
Oops, something went wrong.