From 1d2a6addac1f849ebdfb5e746e1d973507450860 Mon Sep 17 00:00:00 2001 From: Laszlo Teveli Date: Mon, 13 Aug 2018 21:35:42 +0200 Subject: [PATCH] Enhancements --- README.md | 2 +- Scripts/Sources/Automation/Eval.swift | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9c5e48ca9..cbd38981f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Travis CI status](https://travis-ci.org/tevelee/Eval.svg?branch=master)](https://travis-ci.org/tevelee/Eval) [![Framework version](https://img.shields.io/badge/Version-1.3.2-yellow.svg)]() -[![Swift version](https://img.shields.io/badge/Swift-4.0-orange.svg)]() +[![Swift version](https://img.shields.io/badge/Swift-4.2-orange.svg)]() [![Code Documentation Coverage](https://tevelee.github.io/Eval/badge.svg)](https://tevelee.github.io/Eval) [![Code Test Coverage](https://codecov.io/gh/tevelee/Eval/branch/master/graph/badge.svg)](https://codecov.io/gh/tevelee/Eval) [![Platforms](https://img.shields.io/badge/Platforms-iOS%20|%20macOS%20|%20Linux-blue.svg)]() diff --git a/Scripts/Sources/Automation/Eval.swift b/Scripts/Sources/Automation/Eval.swift index cc42e3727..d332dd18d 100644 --- a/Scripts/Sources/Automation/Eval.swift +++ b/Scripts/Sources/Automation/Eval.swift @@ -187,7 +187,7 @@ class Eval { print("📦 📤 Pushing") let remote = "origin" - try Shell.executeAndPrint("git -C \(dir) push \(remote) \(branch)", timeout: 30) + try Shell.executeAndPrint("git -C \(dir) push --force-with-lease \(remote) \(branch)", timeout: 30) } else { throw CIError.logicalError(message: "Repository URL not found") } @@ -196,6 +196,8 @@ class Eval { static func runCocoaPodsLinter() throws { print("🔮 Validating CocoaPods support") let flags = TravisCI.isRunningLocally() ? "--verbose" : "" + try Shell.executeAndPrint("export EXPANDED_CODE_SIGN_IDENTITY=-", timeout: 10) + try Shell.executeAndPrint("export EXPANDED_CODE_SIGN_IDENTITY_NAME=-", timeout: 10) try Shell.executeAndPrint("bundle exec pod lib lint \(flags)", timeout: 300) } @@ -247,8 +249,8 @@ class Eval { print("💁🏻 Pushing changes") try Shell.executeAndPrint("git remote add ssh_origin git@github.com:tevelee/Eval.git") - try Shell.executeAndPrint("git push ssh_origin HEAD:master --force") - try Shell.executeAndPrint("git push ssh_origin HEAD:master --force --tags") + try Shell.executeAndPrint("git push ssh_origin HEAD:master --force-with-lease") + try Shell.executeAndPrint("git push ssh_origin HEAD:master --force-with-lease --tags") print("📦 Releasing package managers") try Shell.executeAndPrint("pod trunk push . || true", timeout: 600)