Skip to content

Commit

Permalink
🔀 Merge branch 'develop' of https://github.com/AssistantNMS/App into …
Browse files Browse the repository at this point in the history
…develop
  • Loading branch information
Khaoz-Topsy committed Sep 23, 2024
2 parents c285929 + 03f18a6 commit ba564d2
Show file tree
Hide file tree
Showing 6 changed files with 287 additions and 50 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/flutterWindows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ permissions:

# Allow one concurrent deployment
concurrency:
group: 'build-windows'
group: "build-windows"
cancel-in-progress: true

on:
workflow_dispatch:
push:
branches: ['main']
branches: ["main"]

jobs:
build:
Expand All @@ -24,9 +24,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v1
- uses: subosito/flutter-action@v2
with:
channel: 'stable' # 'stable', 'beta', 'dev' or 'master'
channel: "stable" # 'stable', 'beta', 'dev' or 'master'
flutter-version-file: pubspec.yaml

- name: Write env file
env:
Expand All @@ -46,7 +47,7 @@ jobs:
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "installers\assistantNMS.iss"
- name: Upload Artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: AssistantNMS_setup
path: 'installers/AssistantNMS_setup.exe'
path: "installers/AssistantNMS_setup.exe"
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '12.0'
platform :ios, '13.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
Loading

0 comments on commit ba564d2

Please sign in to comment.