Compare commits

...
Author SHA1 Message Date
vkamn c71e65d9cd chore: minor fixes (#3493)
* fix: keep TestFlight upload going while another build is in beta review

* chore: drop cisco, asus, logitech, dropbox and speedtest from default SNI list

* fix: keep safe area when screenshots are disallowed

* chore: bump version
2026-11-19 12:56:22 +09:00
vkamn 5aff2ce580 fix: run deploy jobs with always() and check build results in a step (#3483) 2026-11-17 02:03:55 +09:00
vkamn 41a6757042 fix: gate deploy jobs on always() with explicit build result checks (#3482) 2026-11-17 01:20:54 +09:00
vkamn f0b12257ab chore: minor fixes (#3481)
* fix: distribute TestFlight builds to the test-external group

* chore: bump version
2026-11-16 22:10:45 +09:00
5 changed files with 36 additions and 15 deletions

No files matched your search

+27 -3
View File
@@ -1695,13 +1695,21 @@ jobs:
# ------------------------------------------------------
Pre-Release:
if: ${{ !cancelled() && startsWith(github.ref, 'refs/tags/') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'skipped') }}
if: ${{ always() && startsWith(github.ref, 'refs/tags/') }}
needs: [Build-Linux-Ubuntu, Build-Windows, Build-iOS, Build-MacOS, Build-MacOS-NE, Build-Android]
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: 'Check builds'
working-directory: .
env:
NEEDS: ${{ toJSON(needs) }}
run: |
jq -c 'map_values(.result)' <<< "$NEEDS"
jq -e 'all(.[]; .result == "success" or .result == "skipped")' <<< "$NEEDS"
- name: 'Get release notes template'
uses: actions/checkout@v4
with:
@@ -1742,7 +1750,7 @@ jobs:
# ------------------------------------------------------
TestFlight:
if: ${{ !cancelled() && startsWith(github.ref, 'refs/tags/') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'skipped') }}
if: ${{ always() && startsWith(github.ref, 'refs/tags/') }}
needs: [Build-Linux-Ubuntu, Build-Windows, Build-iOS, Build-MacOS, Build-MacOS-NE, Build-Android]
runs-on: macos-26
@@ -1757,6 +1765,14 @@ jobs:
shell: bash
steps:
- name: 'Check builds'
working-directory: .
env:
NEEDS: ${{ toJSON(needs) }}
run: |
jq -c 'map_values(.result)' <<< "$NEEDS"
jq -e 'all(.[]; .result == "success" or .result == "skipped")' <<< "$NEEDS"
- name: 'Get fastlane config'
uses: actions/checkout@v4
with:
@@ -1786,7 +1802,7 @@ jobs:
# ------------------------------------------------------
Google-Play:
if: ${{ !cancelled() && startsWith(github.ref, 'refs/tags/') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'skipped') }}
if: ${{ always() && startsWith(github.ref, 'refs/tags/') }}
needs: [Build-Linux-Ubuntu, Build-Windows, Build-iOS, Build-MacOS, Build-MacOS-NE, Build-Android]
runs-on: ubuntu-24.04
@@ -1796,6 +1812,14 @@ jobs:
shell: bash
steps:
- name: 'Check builds'
working-directory: .
env:
NEEDS: ${{ toJSON(needs) }}
run: |
jq -c 'map_values(.result)' <<< "$NEEDS"
jq -e 'all(.[]; .result == "success" or .result == "skipped")' <<< "$NEEDS"
- name: 'Get fastlane config'
uses: actions/checkout@v4
with:
+2 -2
View File
@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(PROJECT AmneziaVPN)
if(NOT AMNEZIAVPN_VERSION)
set(AMNEZIAVPN_VERSION 5.1.1.6 CACHE STRING "Client app version")
set(AMNEZIAVPN_VERSION 5.1.1.10 CACHE STRING "Client app version")
endif()
set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
@@ -34,7 +34,7 @@ set(RELEASE_DATE "${CURRENT_DATE}")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
# bump by 2 on every release, because we're releasing two versions on the play store
set(APP_ANDROID_VERSION_CODE 2192)
set(APP_ANDROID_VERSION_CODE 2194)
if(DEFINED APP_ANDROID_VERSION_CODE_OFFSET)
math(EXPR APP_ANDROID_VERSION_CODE "${APP_ANDROID_VERSION_CODE} + ${APP_ANDROID_VERSION_CODE_OFFSET}")
endif()
@@ -65,13 +65,8 @@ namespace amnezia
"www.bing.com",
"www.samsung.com",
"www.nvidia.com",
"www.cisco.com",
"www.asus.com",
"www.logitech.com",
"www.dropbox.com",
"www.mozilla.org",
"addons.mozilla.org",
"www.speedtest.net",
};
constexpr char defaultPort[] = "443";
+3 -4
View File
@@ -81,9 +81,8 @@ class ScreenProtection {
public func enable(for view: UIView) {
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
view.subviews.forEach {
self.pairs.append(ProtectionPair(from: $0))
}
guard self.pairs.isEmpty else { return }
self.pairs.append(ProtectionPair(from: view))
}
}
@@ -128,7 +127,7 @@ struct ProtectionPair {
}
func removeProtection() {
textField.superview?.superview?.layer.addSublayer(layer)
textField.layer.superlayer?.insertSublayer(layer, above: textField.layer)
textField.layer.removeFromSuperlayer()
textField.removeFromSuperview()
}
+4 -1
View File
@@ -36,9 +36,12 @@ def upload_to_external_testers(package)
upload_to_testflight(
**package,
distribute_external: true,
groups: ["test"],
groups: ["test-external"],
changelog: "Improve stability"
)
rescue Spaceship::UnexpectedResponse => e
raise unless e.message.include?("already in beta review")
UI.important(e.message)
end
platform :ios do