From 1add0c89c1ebb2b0b167316202760b032cb77b75 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 16:18:06 +0200 Subject: [PATCH 01/24] Upload code to vm --- .drone.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.drone.yml b/.drone.yml index 6f0fd26..3113a1e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,14 @@ clone: tags: true pipeline: + upload_to_macos: + image: appleboy/drone-scp + host: home.jonasfranz.software + secrets: [ ssh_username, ssh_key ] + port: 1413 + source: ./ + target: /tmp/drone_build_$$DRONE_BUILD_NUMBER + test: image: nathansamson/flutter-builder-docker:v0.6.0 pull: true -- 2.45.1 From 3c53045598ce0adbc5704b5d4b9e4f8bada1fc14 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 16:40:29 +0200 Subject: [PATCH 02/24] Add build_ios --- .drone.yml | 20 +++++++++++++++++++- Makefile | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3113a1e..178a2c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,9 @@ pipeline: secrets: [ ssh_username, ssh_key ] port: 1413 source: ./ - target: /tmp/drone_build_$$DRONE_BUILD_NUMBER + target: /tmp/drone_build_${DRONE_BUILD_NUMBER} + when: + event: [ push, tag] test: image: nathansamson/flutter-builder-docker:v0.6.0 @@ -34,6 +36,22 @@ pipeline: - mv build/app/outputs/apk/*/*.apk apks when: event: [ push, tag ] + + build_ios: + image: appleboy/drone-ssh + host: home.jonasfranz.software + port: 1413 + secrets: [ ssh_username, ssh_key ] + script: + - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} + - flutter packages get + - make build-ios-all + - mkdir ipas + - mv build/app/out + - cd .. + - rm -rf /tmp/drone_build_${DRONE_BUILD_NUMBER} + when: + event: [ push, tag] # Push the releases to our pseudo-s3-bucket release: diff --git a/Makefile b/Makefile index 681101e..5f0f734 100644 --- a/Makefile +++ b/Makefile @@ -27,4 +27,19 @@ build-debug: .PHONY: build-profile build-profile: - flutter build apk --profile --build-name=$(VERSION) \ No newline at end of file + flutter build apk --profile --build-name=$(VERSION) + +.PHONY: build-ios-all +build-all: build-ios-release build-ios-debug build-ios-profile + +.PHONY: build-ios-release +build-release: + flutter build ios --release --build-name=$(VERSION) + +.PHONY: build-ios-debug +build-debug: + flutter build ios --debug --build-name=$(VERSION) + +.PHONY: build-ios-profile +build-profile: + flutter build ios --profile --build-name=$(VERSION) \ No newline at end of file -- 2.45.1 From fa5d3eba4432c72bdaa8ec5d0b19519d2fc7cbd9 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 16:45:25 +0200 Subject: [PATCH 03/24] Fix make file Add clean ios step --- .drone.yml | 13 +++++++++++-- Makefile | 8 ++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 178a2c3..7fa23a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,8 +48,6 @@ pipeline: - make build-ios-all - mkdir ipas - mv build/app/out - - cd .. - - rm -rf /tmp/drone_build_${DRONE_BUILD_NUMBER} when: event: [ push, tag] @@ -81,3 +79,14 @@ pipeline: when: event: [ push ] branch: [ master ] + + clean_ios: + image: appleboy/drone-ssh + host: home.jonasfranz.software + port: 1413 + secrets: [ ssh_username, ssh_key ] + script: + - rm -rf /tmp/drone_build_${DRONE_BUILD_NUMBER} + when: + status: [ failure, success ] + event: [ push, tag] \ No newline at end of file diff --git a/Makefile b/Makefile index 5f0f734..e1d7852 100644 --- a/Makefile +++ b/Makefile @@ -30,16 +30,16 @@ build-profile: flutter build apk --profile --build-name=$(VERSION) .PHONY: build-ios-all -build-all: build-ios-release build-ios-debug build-ios-profile +build-ios-all: build-ios-release build-ios-debug build-ios-profile .PHONY: build-ios-release -build-release: +build-ios-release: flutter build ios --release --build-name=$(VERSION) .PHONY: build-ios-debug -build-debug: +build-ios-debug: flutter build ios --debug --build-name=$(VERSION) .PHONY: build-ios-profile -build-profile: +build-ios-profile: flutter build ios --profile --build-name=$(VERSION) \ No newline at end of file -- 2.45.1 From e830e24d36919a63ebaaf7ff52f95863c180c04b Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 16:52:34 +0200 Subject: [PATCH 04/24] Add flutter path --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 7fa23a7..466da01 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,6 +30,7 @@ pipeline: image: nathansamson/flutter-builder-docker:v0.6.0 pull: true commands: + - export PATH=/Users/macosvm/flutter/bin:$PATH - flutter packages get - make build-all - mkdir apks -- 2.45.1 From f0a9cd52c979100caa11ff71423365efb868fb61 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 21:32:12 +0200 Subject: [PATCH 05/24] Fix drone --- .drone.yml | 4 ++-- Makefile | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 466da01..fa0fc0f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,6 +28,7 @@ pipeline: build: image: nathansamson/flutter-builder-docker:v0.6.0 + group: build pull: true commands: - export PATH=/Users/macosvm/flutter/bin:$PATH @@ -40,6 +41,7 @@ pipeline: build_ios: image: appleboy/drone-ssh + group: build host: home.jonasfranz.software port: 1413 secrets: [ ssh_username, ssh_key ] @@ -47,8 +49,6 @@ pipeline: - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} - flutter packages get - make build-ios-all - - mkdir ipas - - mv build/app/out when: event: [ push, tag] diff --git a/Makefile b/Makefile index e1d7852..544009f 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,14 @@ build-ios-all: build-ios-release build-ios-debug build-ios-profile .PHONY: build-ios-release build-ios-release: - flutter build ios --release --build-name=$(VERSION) + flutter build ios --release --build-name=$(VERSION) --no-codesign .PHONY: build-ios-debug build-ios-debug: - flutter build ios --debug --build-name=$(VERSION) + flutter build ios --debug --build-name=$(VERSION) --no-codesign + mv build/ios/iphoneos/Runner.app build/ios/iphoneos/Runner-debug.app .PHONY: build-ios-profile build-ios-profile: - flutter build ios --profile --build-name=$(VERSION) \ No newline at end of file + flutter build ios --profile --build-name=$(VERSION) --no-codesign + mv build/ios/iphoneos/Runner.app build/ios/iphoneos/Runner-profile.app \ No newline at end of file -- 2.45.1 From 5dda43a97b27c7abab8b22e1bb2b06d981259848 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:17:07 +0200 Subject: [PATCH 06/24] Change macos port --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index fa0fc0f..2103365 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ pipeline: image: appleboy/drone-scp host: home.jonasfranz.software secrets: [ ssh_username, ssh_key ] - port: 1413 + port: 2222 source: ./ target: /tmp/drone_build_${DRONE_BUILD_NUMBER} when: @@ -43,7 +43,7 @@ pipeline: image: appleboy/drone-ssh group: build host: home.jonasfranz.software - port: 1413 + port: 2222 secrets: [ ssh_username, ssh_key ] script: - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} @@ -84,7 +84,7 @@ pipeline: clean_ios: image: appleboy/drone-ssh host: home.jonasfranz.software - port: 1413 + port: 2222 secrets: [ ssh_username, ssh_key ] script: - rm -rf /tmp/drone_build_${DRONE_BUILD_NUMBER} -- 2.45.1 From cfe9befdfaa35850f206f434f3db8d87955fe13b Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:19:14 +0200 Subject: [PATCH 07/24] Move export statement to correct position --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2103365..f08c63b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,6 @@ pipeline: group: build pull: true commands: - - export PATH=/Users/macosvm/flutter/bin:$PATH - flutter packages get - make build-all - mkdir apks @@ -46,6 +45,7 @@ pipeline: port: 2222 secrets: [ ssh_username, ssh_key ] script: + - export PATH=/Users/macosvm/flutter/bin:$PATH - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} - flutter packages get - make build-ios-all -- 2.45.1 From 7b37a7c4000f3ba211b49c7ae8d9bda89c567c1a Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:22:14 +0200 Subject: [PATCH 08/24] Add longer timeout to SSH build --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index f08c63b..a62e82e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,6 +44,7 @@ pipeline: host: home.jonasfranz.software port: 2222 secrets: [ ssh_username, ssh_key ] + command_timeout: 600 script: - export PATH=/Users/macosvm/flutter/bin:$PATH - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} -- 2.45.1 From 73edc6583cfd34e31b5068cf2accf92cfedce4f4 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:26:07 +0200 Subject: [PATCH 09/24] Install cocoapods --- .drone.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a62e82e..957ebd6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,10 +44,13 @@ pipeline: host: home.jonasfranz.software port: 2222 secrets: [ ssh_username, ssh_key ] - command_timeout: 600 + command_timeout: 900 script: - export PATH=/Users/macosvm/flutter/bin:$PATH - - cd /tmp/drone_build_${DRONE_BUILD_NUMBER} + - export EXPANDED_CODE_SIGN_IDENTITY="" + - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/iOS + - pod install + - cd .. - flutter packages get - make build-ios-all when: -- 2.45.1 From 79fb00afb701b514f3c27ed96b6dd7dd6987880b Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:29:18 +0200 Subject: [PATCH 10/24] Add echo --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 957ebd6..8dc360f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,6 +50,7 @@ pipeline: - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/iOS - pod install + - echo "Installed pods in `pwd`" - cd .. - flutter packages get - make build-ios-all -- 2.45.1 From 2483c1b2eb366aba75a139e5af5d7bf1602c2d74 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:30:30 +0200 Subject: [PATCH 11/24] Use correct path for remote build --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8dc360f..150aa65 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,7 +48,7 @@ pipeline: script: - export PATH=/Users/macosvm/flutter/bin:$PATH - export EXPANDED_CODE_SIGN_IDENTITY="" - - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/iOS + - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios - pod install - echo "Installed pods in `pwd`" - cd .. -- 2.45.1 From d0cda640c33409785a11ac0ab0d041a816e2de7b Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:32:22 +0200 Subject: [PATCH 12/24] Outputting catfile --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 150aa65..0fed268 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,6 +50,7 @@ pipeline: - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios - pod install + - cat PodFile - echo "Installed pods in `pwd`" - cd .. - flutter packages get -- 2.45.1 From 554f23a9810413f1af6cbae038b21b786a285138 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:32:39 +0200 Subject: [PATCH 13/24] Use correct filename --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0fed268..0fe40df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,7 +50,7 @@ pipeline: - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios - pod install - - cat PodFile + - cat Podfile - echo "Installed pods in `pwd`" - cd .. - flutter packages get -- 2.45.1 From 7e1e8f2d61361dffa83dc79bff5a76082f4039f3 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:35:07 +0200 Subject: [PATCH 14/24] Add ls lah --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0fe40df..b0e433d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,7 +50,7 @@ pipeline: - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios - pod install - - cat Podfile + - ls -lah - echo "Installed pods in `pwd`" - cd .. - flutter packages get -- 2.45.1 From 9481dd09e435ba19d36169817ea4ece0e9083140 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:41:45 +0200 Subject: [PATCH 15/24] Add Podfile --- ios/Podfile | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 ios/Podfile diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..2dfb501 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,65 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +def parse_KV_file(file, separator='=') + file_abs_path = File.expand_path(file) + if !File.exists? file_abs_path + return []; + end + pods_ary = [] + skip_line_start_symbols = ["#", "/"] + File.foreach(file_abs_path) { |line| + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } + plugin = line.split(pattern=separator) + if plugin.length == 2 + podname = plugin[0].strip() + path = plugin[1].strip() + podpath = File.expand_path("#{path}", file_abs_path) + pods_ary.push({:name => podname, :path => podpath}); + else + puts "Invalid plugin specification: #{line}" + end + } + return pods_ary +end + +target 'Runner' do + use_frameworks! + + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock + # referring to absolute paths on developers' machines. + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') + + # Flutter Pods + generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') + if generated_xcode_build_settings.empty? + puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first." + end + generated_xcode_build_settings.map { |p| + if p[:name] == 'FLUTTER_FRAMEWORK_DIR' + symlink = File.join('.symlinks', 'flutter') + File.symlink(File.dirname(p[:path]), symlink) + pod 'Flutter', :path => File.join(symlink, File.basename(p[:path])) + end + } + + # Plugin Pods + plugin_pods = parse_KV_file('../.flutter-plugins') + plugin_pods.map { |p| + symlink = File.join('.symlinks', 'plugins', p[:name]) + File.symlink(p[:path], symlink) + pod p[:name], :path => File.join(symlink, 'ios') + } +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end -- 2.45.1 From d87fcd57d13c95bdcb087b0809a9e239b2758fce Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:44:51 +0200 Subject: [PATCH 16/24] Start bin bash --- .drone.yml | 1 + .gradle/4.4/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/buildOutputCleanup/cache.properties | 2 ++ ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .gradle/4.4/fileChanges/last-build.bin create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.drone.yml b/.drone.yml index b0e433d..69a24e4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,6 +46,7 @@ pipeline: secrets: [ ssh_username, ssh_key ] command_timeout: 900 script: + - /bin/bash - export PATH=/Users/macosvm/flutter/bin:$PATH - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios diff --git a/.gradle/4.4/fileChanges/last-build.bin b/.gradle/4.4/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..dcb1382 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sat Sep 15 16:48:22 CEST 2018 +gradle.version=4.4 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 43e80ee..58e9ca9 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", + "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", "${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework", ); name = "[CP] Embed Pods Frameworks"; diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + -- 2.45.1 From b77ce0824306eb94737470b260e53538df71c68a Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:45:13 +0200 Subject: [PATCH 17/24] Revert "Start bin bash" This reverts commit d87fcd5 --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 69a24e4..b0e433d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,7 +46,6 @@ pipeline: secrets: [ ssh_username, ssh_key ] command_timeout: 900 script: - - /bin/bash - export PATH=/Users/macosvm/flutter/bin:$PATH - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios -- 2.45.1 From 21fdec0aa818a12a769e3e72e2c5d868969feee5 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:45:36 +0200 Subject: [PATCH 18/24] Add /bin/bash --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index b0e433d..69a24e4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,6 +46,7 @@ pipeline: secrets: [ ssh_username, ssh_key ] command_timeout: 900 script: + - /bin/bash - export PATH=/Users/macosvm/flutter/bin:$PATH - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios -- 2.45.1 From b04307013f18795ff8198c3312bd97b93302480f Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:47:56 +0200 Subject: [PATCH 19/24] Start bin bash --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 69a24e4..bdd3dc4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,6 +47,7 @@ pipeline: command_timeout: 900 script: - /bin/bash + - echo "export PATH=/usr/local/bin:$PATH" >> ~/.bash_profile && source ~/.bash_profile - export PATH=/Users/macosvm/flutter/bin:$PATH - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios -- 2.45.1 From dad730ed1cf01c59b87e250836e1d8483447ba19 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sun, 23 Sep 2018 22:59:03 +0200 Subject: [PATCH 20/24] Cleanup --- .drone.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index bdd3dc4..39ae813 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,14 +46,10 @@ pipeline: secrets: [ ssh_username, ssh_key ] command_timeout: 900 script: - - /bin/bash - - echo "export PATH=/usr/local/bin:$PATH" >> ~/.bash_profile && source ~/.bash_profile - - export PATH=/Users/macosvm/flutter/bin:$PATH + - source ~/.bash_profile - export EXPANDED_CODE_SIGN_IDENTITY="" - cd /tmp/drone_build_${DRONE_BUILD_NUMBER}/ios - pod install - - ls -lah - - echo "Installed pods in `pwd`" - cd .. - flutter packages get - make build-ios-all -- 2.45.1 From e617d93ee017b84f925013306cace6580c6d092f Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Mon, 24 Sep 2018 10:55:59 +0200 Subject: [PATCH 21/24] Fix xcode project --- ios/Runner.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 58e9ca9..f51cc46 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -14,7 +14,7 @@ 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -273,7 +273,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", + "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", "${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework", ); name = "[CP] Embed Pods Frameworks"; -- 2.45.1 From ca7bf35f7b4f1c07147030b81d2e6f3f3753f708 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Mon, 8 Oct 2018 16:58:55 +0200 Subject: [PATCH 22/24] Add scp docker image --- Dockerfile.scp | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile.scp diff --git a/Dockerfile.scp b/Dockerfile.scp new file mode 100644 index 0000000..d8bf117 --- /dev/null +++ b/Dockerfile.scp @@ -0,0 +1,2 @@ +FROM alpine +RUN apk add --no-cache openssh-client \ No newline at end of file -- 2.45.1 From f2b7bb0bc3ffb6ac90933c99ba02e780a8a18cc7 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Mon, 8 Oct 2018 17:08:12 +0200 Subject: [PATCH 23/24] Fix dockerfile --- Dockerfile.scp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.scp b/Dockerfile.scp index d8bf117..b537904 100644 --- a/Dockerfile.scp +++ b/Dockerfile.scp @@ -1,2 +1,3 @@ FROM alpine -RUN apk add --no-cache openssh-client \ No newline at end of file +RUN apk add --no-cache openssh-client +RUN mkdir ~/.ssh && ssh-keyscan -H home.jonasfranz.software -P 2222 >> ~/.ssh/known_hosts \ No newline at end of file -- 2.45.1 From 9fbdd2d7097b357fb17005937b650985cd2313b1 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Mon, 8 Oct 2018 17:57:43 +0200 Subject: [PATCH 24/24] Add download ios artifacts --- .drone.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8124ad1..563c308 100644 --- a/.drone.yml +++ b/.drone.yml @@ -54,7 +54,15 @@ pipeline: - flutter packages get - make build-ios-all when: - event: [ push, tag] + event: [ push, tag ] + + download_ios_artifacts: + image: vikunja/scp + secrets: [ ssh_username, ssh_key ] + commands: + - echo $ssh_key | scp -P 2222 -i /dev/stdin ${ssh_username}@home.jonasfranz.software:/tmp/drone_build_${DRONE_BUILD_NUMBER}/build/ios/iphoneos/* apks/ + when: + event: [ push, tag ] # Push the releases to our pseudo-s3-bucket release: -- 2.45.1