From 76a7453dc9b04d74fa4c482960d27410d46a7519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=A8=E3=81=97?= Date: Mon, 4 Mar 2019 10:18:53 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9f79bc9..b045d62 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,23 @@ -# CIで利用する用のアプリ(iOS版) -オンプレCI、クラウドCIで試してみるためのiOS版のアプリです。 -iOSアプリのコードだけでなく、CIに関する情報も併せて管理します。 +# CI/CDサービスで利用する用のアプリ(iOS版) +CI/CDサービスで試してみるためのiOS版のアプリです。 +iOSアプリのコードだけでなく、CI/CDサービスに関する情報も併せて管理します。 - [ドキュメント](docs/README.md) +# ブランチ管理 + + * master + * 最新 + * feature/* + * 機能開発用 + * release + * リリースする用 + +機能開発時にmasterからfeature/xxxをきります。 +開発が終わったらPRをmasterに向けてだします。 +リリースのタイミングでreleaseにmergeします。 + + ## CI Badge Badgeが利用できるCIサービスについては以下に全て貼ります。 From 31235700882bd4e0042e898d2088c65d2bbf2347 Mon Sep 17 00:00:00 2001 From: tarappo Date: Mon, 4 Mar 2019 10:52:18 +0900 Subject: [PATCH 2/6] goodbye 1.0 circleci yml --- circle.yml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 circle.yml diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 4242f9e..0000000 --- a/circle.yml +++ /dev/null @@ -1,6 +0,0 @@ -machine: - xcode: - version: 8.3.3 -test: - override: - - bundle exec fastlane build From a9f0a299dd19a0893769e24a1e1b4b2fcf5996d3 Mon Sep 17 00:00:00 2001 From: tarappo Date: Mon, 4 Mar 2019 10:52:41 +0900 Subject: [PATCH 3/6] add circle ci yml for 2.0 --- .circleci/config.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..fcc42a5 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,39 @@ +# iOS CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/ios-migrating-from-1-2/ for more details +# +version: 2 +jobs: + build: + + # Specify the Xcode version to use + macos: + # xcode: "8.3.3" + + steps: + - checkout + + # Install CocoaPods + # - run: + # name: Install CocoaPods + # command: pod install + + # Build the app and run tests + - run: + name: Build and run tests + command: fastlane scan + environment: + SCAN_DEVICE: iPhone 6 + SCAN_SCHEME: WebTests + + # Collect XML test results data to show in the UI, + # and save the same XML files under test-results folder + # in the Artifacts tab + - store_test_results: + path: test_output/report.xml + - store_artifacts: + path: /tmp/test-results + destination: scan-test-results + - store_artifacts: + path: ~/Library/Logs/scan + destination: scan-logs \ No newline at end of file From 7de11c26dc9efad82aa043dc3484b467810d5ec7 Mon Sep 17 00:00:00 2001 From: tarappo Date: Mon, 4 Mar 2019 11:14:01 +0900 Subject: [PATCH 4/6] set xcode version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fcc42a5..f6deb92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: # Specify the Xcode version to use macos: - # xcode: "8.3.3" + xcode: "10.2.0" steps: - checkout From 1b4a4b75f31fc917590578886565f48e63dc6a97 Mon Sep 17 00:00:00 2001 From: tarappo Date: Mon, 4 Mar 2019 11:17:18 +0900 Subject: [PATCH 5/6] remove scheme for scan --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6deb92..c674f5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,6 @@ jobs: command: fastlane scan environment: SCAN_DEVICE: iPhone 6 - SCAN_SCHEME: WebTests # Collect XML test results data to show in the UI, # and save the same XML files under test-results folder From 01d32f7eb2d9269109fe6e84cfae4eab6c4f2ab0 Mon Sep 17 00:00:00 2001 From: tarappo Date: Mon, 4 Mar 2019 11:21:19 +0900 Subject: [PATCH 6/6] change swift version 3.0 to 4.2 --- ci-sample.xcodeproj/project.pbxproj | 22 +- .../xcshareddata/xcschemes/ci-sample.xcscheme | 4 +- ci-sample/AppDelegate.swift | 2 +- .../AppIcon.appiconset/Contents.json | 246 +++++++++--------- 4 files changed, 142 insertions(+), 132 deletions(-) diff --git a/ci-sample.xcodeproj/project.pbxproj b/ci-sample.xcodeproj/project.pbxproj index 9258667..9b76e10 100644 --- a/ci-sample.xcodeproj/project.pbxproj +++ b/ci-sample.xcodeproj/project.pbxproj @@ -141,7 +141,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = tarappo; TargetAttributes = { 73FF83B5222B1FDF00A3D3ED = { @@ -318,15 +318,23 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -368,15 +376,23 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -416,7 +432,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "ci-sample-dev"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -435,7 +451,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = "ci-sample-adhoc"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/ci-sample.xcodeproj/xcshareddata/xcschemes/ci-sample.xcscheme b/ci-sample.xcodeproj/xcshareddata/xcschemes/ci-sample.xcscheme index ae43fe9..5ddbf0c 100644 --- a/ci-sample.xcodeproj/xcshareddata/xcschemes/ci-sample.xcscheme +++ b/ci-sample.xcodeproj/xcshareddata/xcschemes/ci-sample.xcscheme @@ -1,6 +1,6 @@ diff --git a/ci-sample/AppDelegate.swift b/ci-sample/AppDelegate.swift index 3e27603..f385918 100644 --- a/ci-sample/AppDelegate.swift +++ b/ci-sample/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/ci-sample/Assets.xcassets/AppIcon.appiconset/Contents.json b/ci-sample/Assets.xcassets/AppIcon.appiconset/Contents.json index 99f7a0c..8d8f4bb 100755 --- a/ci-sample/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ci-sample/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,128 +1,122 @@ { - "images":[ - { - "idiom":"iphone", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"iphone", - "size":"20x20", - "scale":"3x", - "filename":"Icon-App-20x20@3x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"3x", - "filename":"Icon-App-29x29@3x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"3x", - "filename":"Icon-App-40x40@3x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"2x", - "filename":"Icon-App-60x60@2x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"3x", - "filename":"Icon-App-60x60@3x.png" - }, - { - "idiom":"iphone", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"1x", - "filename":"Icon-App-20x20@1x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"1x", - "filename":"Icon-App-40x40@1x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"1x", - "filename":"Icon-App-76x76@1x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"83.5x83.5", - "scale":"2x", - "filename":"Icon-App-83.5x83.5@2x.png" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "scale" : "1x", - "filename" : "ItunesArtwork@2x.png" - } - ], - "info":{ - "version":1, - "author":"makeappicon" + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "ItunesArtwork@2x.png", + "scale" : "1x" } -} + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file