Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
working-directory: ./client
steps:
- name: Checkout main repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: "recursive"

- name: Setup flutter
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.35.7
flutter-version: 3.38.7

- name: Use homebrew ruby
run: |
Expand Down Expand Up @@ -66,14 +66,6 @@ jobs:
api-key-id: ${{ secrets.ASC_API_KEY_ID }}
api-private-key: ${{ secrets.PRIVATE_KEY_CONTENTS }}

- name: Upload iOS Artifact
uses: actions/upload-artifact@v4
if: startsWith(github.ref, 'refs/tags/')
with:
name: ios-app
path: "client/build/ios/ipa/Defguard.ipa"
retention-days: 2

build-android:
runs-on: [self-hosted, macOS]
env:
Expand All @@ -83,7 +75,7 @@ jobs:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up Java
uses: actions/setup-java@v3
Expand All @@ -95,7 +87,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.32.7
flutter-version: 3.38.7

- name: Accept licenses
run: yes | flutter doctor --android-licenses
Expand Down Expand Up @@ -147,7 +139,7 @@ jobs:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up Java
uses: actions/setup-java@v3
Expand All @@ -159,7 +151,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.32.7
flutter-version: 3.38.7

- name: Install Android SDK components
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Scan code with Trivy
uses: aquasecurity/trivy-action@0.33.1
Expand All @@ -45,7 +45,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: 3.32.4
flutter-version: 3.38.7

- name: get deps
run: flutter pub get
Expand All @@ -63,15 +63,15 @@ jobs:

# steps:
# - name: Checkout
# uses: actions/checkout@v4
# uses: actions/checkout@v6
# with:
# submodules: "recursive"

# - name: setup flutter
# uses: subosito/flutter-action@v2
# with:
# channel: stable
# flutter-version: 3.32.6
# flutter-version: 3.38.7

# - name: get deps
# run: flutter pub get
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sbom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ steps.vars.outputs.TAG_NAME }}
submodules: recursive
Expand Down
13 changes: 3 additions & 10 deletions client/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ PODS:
- FlutterMacOS
- package_info_plus (0.4.5):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter
- share_plus (0.0.1):
Expand Down Expand Up @@ -66,7 +63,6 @@ DEPENDENCIES:
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
Expand Down Expand Up @@ -97,8 +93,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/mobile_scanner/darwin"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
share_plus:
Expand All @@ -119,16 +113,15 @@ SPEC CHECKSUMS:
flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
local_auth_darwin: fa4b06454df7df8e97c18d7ee55151c57e7af0de
local_auth_darwin: 63c73d6d28cc3e239be2b6aa460ea6e317cd5100
mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
sqlite3_flutter_libs: 7bea6d85399aebaeb54e4f9845dcac6f5033cf22
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
wireguard_plugin: 4d2720563b180d23101f7162ecdbf57203e82e8e

PODFILE CHECKSUM: ae9e65fc23486119b8e977fd41d9213f251e537a
Expand Down
Loading