Merge pull request #2 from PGSSoft/release-new-version

Release new version
PGSSoft · Oct 21, 2018 · 35bee76 · 35bee76
2 parents 55a752b + 676984f
commit 35bee76
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 74 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.3.0](https://github.com/PGSSoft/AutoMate-ModelGenie/releases/tag/1.3.0)
+Released on 2018-10-21.
+
+#### Added
+- Compatibility with Xcode 10.0 and Swift 4.2.
+
 ## [1.2.0](https://github.com/PGSSoft/AutoMate-ModelGenie/releases/tag/1.2.0)
 Released on 2017-11-14.
 

diff --git a/GitHub.Jenkinsfile b/GitHub.Jenkinsfile
@@ -1,40 +1,14 @@
 ios.prepareEnv(xcode: "/Applications/Xcode_10.0.app", danger_bitbucket: null)
 
-node("ios") {
-  timeout(45) {
-    ansiColor('xterm') {
-
-      // Unlock Bitbucket Server credentials
-      withCredentials([usernamePassword(credentialsId: 'pgs-github-PGSJenkins-token', passwordVariable: 'DANGER_GITHUB_API_TOKEN', usernameVariable: '')]) {
-        //
-        // Stages
-        // Prepare node
-        // - clean workspace
-        // - clone repository
-        // - update bundle
-        stage("Prepare & clone") {
-          deleteDir()
-          checkout scm
-
-          sh '''
-            # Bundler
-            bundle install
-          '''
-        }
-
-        // Danger
-        stage("Danger") {
-          sh '''
-            # Danger
-            bundle exec danger
-          '''
-        }
-
-        // Clean
-        stage("Clean") {
-          deleteDir()
-        }
-      }
+ios.runOniOSNode(runBlock: {
+  // Unlock Bitbucket Server credentials
+  withCredentials([usernamePassword(credentialsId: 'pgs-github-PGSJenkins-token', passwordVariable: 'DANGER_GITHUB_API_TOKEN', usernameVariable: '')]) {
+    // Danger
+    stage("Danger") {
+      sh '''
+        # Danger
+        bundle exec danger
+      '''
     }
-  }
-}
+  }  
+})
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,40 +1,14 @@
 ios.prepareEnv(xcode: "/Applications/Xcode_10.0.app")
 
-node("ios") {
-  timeout(45) {
-    ansiColor('xterm') {
-
-      // Unlock Bitbucket Server credentials
-      withCredentials([usernamePassword(credentialsId: 'pgs-software-bitbucket-server-danger_user', passwordVariable: 'DANGER_BITBUCKETSERVER_PASSWORD', usernameVariable: 'DANGER_BITBUCKETSERVER_USERNAME')]) {
-        //
-        // Stages
-        // Prepare node
-        // - clean workspace
-        // - clone repository
-        // - update bundle
-        stage("Prepare & clone") {
-          deleteDir()
-          checkout scm
-
-          sh '''
-            # Bundler
-            bundle install
-          '''
-        }
-
-        // Danger
-        stage("Danger") {
-          sh '''
-            # Danger
-            bundle exec danger
-          '''
-        }
-
-        // Clean
-        stage("Clean") {
-          deleteDir()
-        }
-      }
+ios.runOniOSNode(runBlock: {
+  // Unlock Bitbucket Server credentials
+  withCredentials([usernamePassword(credentialsId: 'pgs-software-bitbucket-server-danger_user', passwordVariable: 'DANGER_BITBUCKETSERVER_PASSWORD', usernameVariable: 'DANGER_BITBUCKETSERVER_USERNAME')]) {
+    // Danger
+    stage("Danger") {
+      sh '''
+        # Danger
+        bundle exec danger
+      '''
     }
-  }
-}
+  }  
+})
diff --git a/Makefile b/Makefile
@@ -0,0 +1,7 @@
+.PHONY: docs push_github
+
+# Push master, develop and tags to GitHub
+push_github:
+	git push github develop
+	git push github master
+	git push github --tags