From 7da037873e596e980a8c8b13891a0b82073c1577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krisztia=CC=81n=20Go=CC=88drei?= Date: Fri, 29 Jul 2016 17:20:30 +0200 Subject: [PATCH] depman update --- bitrise.yml | 118 ++++++------------ deplock.json | 2 +- .../bitrise-core/bitrise-init/CHANGELOG.md | 7 +- .../bitrise-core/bitrise-init/bitrise.yml | 2 +- .../scanners/fastlane/fastlane.go | 2 +- .../bitrise-init/version/version.go | 2 +- 6 files changed, 49 insertions(+), 84 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 4e73b5cf..e71c034f 100755 --- a/bitrise.yml +++ b/bitrise.yml @@ -13,6 +13,8 @@ workflows: test: title: Bitrise Init Test description: Bitrise Init Test + envs: + - CLONE_INTO_DIR: _tmp steps: - script: title: "Scann test: ios-no-shared-schemes" @@ -23,17 +25,11 @@ workflows: rm -rf ./_tmp SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/ios-no-shared-schemes.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -44,19 +40,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-io/sample-apps-ios-simple-objc.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -67,19 +57,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/sample-apps-android-sdk22.git git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -90,19 +74,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/xamarin-sample-app.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -113,33 +91,33 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-io/sample-apps-ios-watchkit.git git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true + - path::./: + title: Step Test + inputs: + - scan_dir: $CLONE_INTO_DIR + - output_dir: ../result + - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL + - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN + - script: + title: "Scanner test: fastlane" inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + - content: |- + #!/bin/bash + set -x + + rm -rf $CLONE_INTO_DIR + SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/fastlane.git + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN - # - script: - # title: "Scann test: android-sdk22-no-gradlew" - # inputs: - # - content: |- - # #!/bin/bash - # set -x - # - # rm -rf ./_tmp - # SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/android-sdk22-no-gradlew.git - # git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - # $SCANNER_BIN --ci config --dir ./_tmp/sample-repo --output-dir ./_tmp/output --format json - script: title: "Scann test: sample-apps-xamarin-ios" inputs: @@ -147,19 +125,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-io/sample-apps-xamarin-ios.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -170,19 +142,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-samples/android-non-executable-gradlew.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN @@ -193,19 +159,13 @@ workflows: #!/bin/bash set -x - rm -rf ./_tmp + rm -rf $CLONE_INTO_DIR SAMPLE_APP_REPOSITORY_URL=https://github.com/bitrise-io/sample-apps-xamarin-android.git - git clone $SAMPLE_APP_REPOSITORY_URL ./_tmp/sample-repo - - change-workdir: - title: Switch working dir to ./_tmp - run_if: true - inputs: - - path: ./_tmp/sample-repo - - is_create_path: true + git clone $SAMPLE_APP_REPOSITORY_URL $CLONE_INTO_DIR - path::./: title: Step Test inputs: - - scan_dir: ./ + - scan_dir: $CLONE_INTO_DIR - output_dir: ../result - scan_result_submit_url: $BITRISE_SCAN_RESULT_POST_URL - scan_result_submit_api_token: $BITRISE_APP_API_TOKEN diff --git a/deplock.json b/deplock.json index 2c22b4a8..6fe77b0e 100644 --- a/deplock.json +++ b/deplock.json @@ -2,7 +2,7 @@ "dep_locks": [ { "url": "https://github.com/bitrise-core/bitrise-init.git", - "revision": "cda32880c9aa2bd20f31d94534e6c0ee8a0b599e" + "revision": "fd5850437e18db75178693eabe0b489e35fa0ac5" } ] } \ No newline at end of file diff --git a/go/src/github.com/bitrise-core/bitrise-init/CHANGELOG.md b/go/src/github.com/bitrise-core/bitrise-init/CHANGELOG.md index 8785be84..ae8b75b6 100644 --- a/go/src/github.com/bitrise-core/bitrise-init/CHANGELOG.md +++ b/go/src/github.com/bitrise-core/bitrise-init/CHANGELOG.md @@ -1,7 +1,12 @@ -## Changelog (Current version: 0.9.10) +## Changelog (Current version: 0.9.11) ----------------- +### 0.9.11 (2016 Jul 29) + +* [1bad745] prepare for 0.9.11 +* [1d56f71] typo fix + ### 0.9.10 (2016 Jul 29) * [ca94c8c] prepare for 0.9.10 diff --git a/go/src/github.com/bitrise-core/bitrise-init/bitrise.yml b/go/src/github.com/bitrise-core/bitrise-init/bitrise.yml index de39ac35..420853c3 100644 --- a/go/src/github.com/bitrise-core/bitrise-init/bitrise.yml +++ b/go/src/github.com/bitrise-core/bitrise-init/bitrise.yml @@ -212,7 +212,7 @@ workflows: 2, Export RELEASE_VERSION 3, Create binaries envs: - - RELEASE_VERSION: 0.9.10 + - RELEASE_VERSION: 0.9.11 after_run: - _export_release_version - create_binaries diff --git a/go/src/github.com/bitrise-core/bitrise-init/scanners/fastlane/fastlane.go b/go/src/github.com/bitrise-core/bitrise-init/scanners/fastlane/fastlane.go index 4a7b9fb2..ece62a1f 100644 --- a/go/src/github.com/bitrise-core/bitrise-init/scanners/fastlane/fastlane.go +++ b/go/src/github.com/bitrise-core/bitrise-init/scanners/fastlane/fastlane.go @@ -164,7 +164,7 @@ func (scanner *Scanner) Options() (models.OptionModel, models.Warnings, error) { return models.OptionModel{}, models.Warnings{}, err } - log.Details("%d lane(s) found") + log.Details("%d lane(s) found", len(lanes)) for _, lane := range lanes { log.Details("- %s", lane) } diff --git a/go/src/github.com/bitrise-core/bitrise-init/version/version.go b/go/src/github.com/bitrise-core/bitrise-init/version/version.go index 53c0d91e..4e34a18e 100644 --- a/go/src/github.com/bitrise-core/bitrise-init/version/version.go +++ b/go/src/github.com/bitrise-core/bitrise-init/version/version.go @@ -1,4 +1,4 @@ package version // VERSION ... -const VERSION = "0.9.10" +const VERSION = "0.9.11"