diff --git a/.DS_Store b/.DS_Store index cfec4dbdd08f3723f0c3f878c3c38e7d108e6beb..a72a933e3df87dcbd1b0e1a0dc4682e1bbee913a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Jenkinsfile b/Jenkinsfile index d98fbd10804dae7e41f9cfcff1c31c71485bf070..889c8e6264b329eea6138bcbe168415d58c16234 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,69 @@ pipeline { - agent any + + agent { + node { + label 'master' + } + } + + options { + buildDiscarder logRotator( + daysToKeepStr: '16', + numToKeepStr: '10' + ) + } + stages { - stage('Stage 11') { + + stage('Cleanup Workspace') { steps { - echo 'Hello world!' + cleanWs() + sh """ + echo "Cleaned Up Workspace For Project" + """ } } - } + + stage('Code Checkout') { + steps { + checkout([ + $class: 'GitSCM', + branches: [[name: '*/main']], + userRemoteConfigs: [[url: 'https://github.com/spring-projects/spring-petclinic.git']] + ]) + } + } + + stage(' Unit Testing') { + steps { + sh """ + echo "Running Unit Tests" + """ + } + } + + stage('Code Analysis') { + steps { + sh """ + echo "Running Code Analysis" + """ + } + } + + stage('Build Deploy Code') { + when { + branch 'develop' + } + steps { + sh """ + echo "Building Artifact" + """ + + sh """ + echo "Deploying Code" + """ + } + } + + } } diff --git a/demo.xcodeproj/project.xcworkspace/xcuserdata/txp.xcuserdatad/UserInterfaceState.xcuserstate b/demo.xcodeproj/project.xcworkspace/xcuserdata/txp.xcuserdatad/UserInterfaceState.xcuserstate index 122a7b0658bd10c3588609d4e4de5ad271661a93..6a0d6352519affc7a72f802a8bd7c5c94380ef78 100644 Binary files a/demo.xcodeproj/project.xcworkspace/xcuserdata/txp.xcuserdatad/UserInterfaceState.xcuserstate and b/demo.xcodeproj/project.xcworkspace/xcuserdata/txp.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/demo/ViewController.swift b/demo/ViewController.swift index 27f24c89f6e2e7d8804fcc43b89e3d4b6ce2cd25..4215587a22407c7879ff51ceab617db5059e4da2 100644 --- a/demo/ViewController.swift +++ b/demo/ViewController.swift @@ -119,7 +119,7 @@ class ViewController: UIViewController { } @objc func touchTest() { - print("touchTest") + print("touchTest in dev 1") // self.vc?.updateFocusIfNeeded() // self.vc?.setNeedsFocusUpdate() // self.vc?.view.setNeedsLayout()