From 92f8adf9b221bde8b65089a0f3f50ef77ea236e4 Mon Sep 17 00:00:00 2001 From: situmops Date: Thu, 9 Jul 2020 09:11:34 +0200 Subject: [PATCH 01/26] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..42075b00 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,31 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- azure-pipelines + +pr: none + +variables: +- group: Passwords + +resources: + repositories: + - repository: sys_kubernetes_templates + type: bitbucket + endpoint: Bitbucket - sistemas + name: situm/sys-kubernetes-templates.git + +pool: + vmImage: 'macOS-latest' + +steps: +- script: echo Hello, world! + displayName: 'Run a one-line script' + +- script: | + echo Add other tasks to build, test, and deploy your project. + echo See https://aka.ms/yaml + displayName: 'Run a multi-line script' From 9c4c69817cead387e71d5240a3cd984967c500aa Mon Sep 17 00:00:00 2001 From: situmops Date: Tue, 14 Jul 2020 15:01:11 +0200 Subject: [PATCH 02/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 42075b00..f7bc72db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,15 +17,28 @@ resources: type: bitbucket endpoint: Bitbucket - sistemas name: situm/sys-kubernetes-templates.git + ref: SIS-144 -pool: - vmImage: 'macOS-latest' +jobs: -steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' - -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' +- job: Ios_job + pool: + vmImage: 'macOS-10.14' + + steps: + - template: azure-templates/upload-sharepoint.yml@sys_kubernetes_templates + parameters: + prepare_sharepoint: False + properties_file: 'scripts/framework.properties' + prepare_ndk: false + + - script: | + if [ "$(branch)" == "master-release" ] || [ "$(branch)" == "master" ] || [ $(echo $(branch) | grep -cE "^release-*") -eq 1 ];then + buildType="Release" + else + buildType="Debug" + fi + echo "##vso[task.setvariable variable=buildType]$(echo $buildType)" + displayName: Set buildType + + \ No newline at end of file From 24dab1df6128d73d45cc9d0f1e0f157c9569a257 Mon Sep 17 00:00:00 2001 From: situmops Date: Tue, 14 Jul 2020 16:44:39 +0200 Subject: [PATCH 03/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7bc72db..caa25a56 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,5 +40,16 @@ jobs: fi echo "##vso[task.setvariable variable=buildType]$(echo $buildType)" displayName: Set buildType + + - script: | + tests/scripts/copy_ios_resources.sh + scripts/update_iosSDK_version.sh . + cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + displayName: iOS test + + - script: | + tests/scripts/self-destruct.sh + displayName: clean repo + \ No newline at end of file From 0cb15341f83829fab380a02872f2b41147e30b67 Mon Sep 17 00:00:00 2001 From: situmops Date: Tue, 14 Jul 2020 16:45:51 +0200 Subject: [PATCH 04/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index caa25a56..beb49fce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,12 +42,14 @@ jobs: displayName: Set buildType - script: | + sudo xcode-select -switch /Applications/Xcode_11.3.1.app tests/scripts/copy_ios_resources.sh scripts/update_iosSDK_version.sh . cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' displayName: iOS test - script: | + sudo xcode-select -switch /Applications/Xcode_11.3.1.app tests/scripts/self-destruct.sh displayName: clean repo From 8bfb767ec54060fb59d231e45e66a740ff3f7f5f Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 08:09:12 +0200 Subject: [PATCH 05/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index beb49fce..58c7ec7a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,7 +45,8 @@ jobs: sudo xcode-select -switch /Applications/Xcode_11.3.1.app tests/scripts/copy_ios_resources.sh scripts/update_iosSDK_version.sh . - cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' displayName: iOS test - script: | From 96287bdd44b738e1c02eeaa43754ccb9e8247b46 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 08:16:25 +0200 Subject: [PATCH 06/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 58c7ec7a..1ead1667 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,6 +40,16 @@ jobs: fi echo "##vso[task.setvariable variable=buildType]$(echo $buildType)" displayName: Set buildType + + - script: | + sudo xcode-select -switch /Applications/Xcode_11.3.1.app + mkdir -p /Users/runner/.cocoapods/repos/ + wget https://github.com/CocoaPods/Specs/archive/master.zip + echo "########## UNZIPPING FILES ##########" + unzip -qq master.zip + echo -n "########## MOVING TO NEW FOLDER ##########" + mv Specs-master/Specs /Users/runner/.cocoapods/repos/ + displayName: Add repo - script: | sudo xcode-select -switch /Applications/Xcode_11.3.1.app From 766cb14554b3fed7c504eea45409faa265397f9c Mon Sep 17 00:00:00 2001 From: Oscar Iglesias Date: Wed, 15 Jul 2020 08:29:20 +0200 Subject: [PATCH 07/26] SIS-144: Disable github cocoapods download --- src/ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ios/Podfile b/src/ios/Podfile index 2651a077..544895cf 100644 --- a/src/ios/Podfile +++ b/src/ios/Podfile @@ -1,6 +1,6 @@ target 'SitumCordovaPlugin' do use_frameworks! - source 'https://github.com/CocoaPods/Specs.git' + #source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' pod 'SitumSDK', '2.37.0' end From 82d8ec081b1dd9377e6ce36641345858bb7f8906 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 11:15:47 +0200 Subject: [PATCH 08/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 53 ++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1ead1667..119bfc62 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,21 +26,6 @@ jobs: vmImage: 'macOS-10.14' steps: - - template: azure-templates/upload-sharepoint.yml@sys_kubernetes_templates - parameters: - prepare_sharepoint: False - properties_file: 'scripts/framework.properties' - prepare_ndk: false - - - script: | - if [ "$(branch)" == "master-release" ] || [ "$(branch)" == "master" ] || [ $(echo $(branch) | grep -cE "^release-*") -eq 1 ];then - buildType="Release" - else - buildType="Debug" - fi - echo "##vso[task.setvariable variable=buildType]$(echo $buildType)" - displayName: Set buildType - - script: | sudo xcode-select -switch /Applications/Xcode_11.3.1.app mkdir -p /Users/runner/.cocoapods/repos/ @@ -52,17 +37,35 @@ jobs: displayName: Add repo - script: | - sudo xcode-select -switch /Applications/Xcode_11.3.1.app - tests/scripts/copy_ios_resources.sh - scripts/update_iosSDK_version.sh . - #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' - cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' + echo "foo" + #sudo xcode-select -switch /Applications/Xcode_11.3.1.app + #tests/scripts/copy_ios_resources.sh + #scripts/update_iosSDK_version.sh . + ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' displayName: iOS test - - script: | - sudo xcode-select -switch /Applications/Xcode_11.3.1.app - tests/scripts/self-destruct.sh - displayName: clean repo - + +- job: Ios_job + pool: + vmImage: 'ubuntu-latest' + + steps: + - script: | + cd src/android + ./gradlew clean + displayName: Clean Android + + - script: | + tests/scripts/copy_android_resources.sh + cd src/android && ./gradlew test --continue + displayName: Android test + - task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'src/android/app/build/test-results/*/*.xml' + displayName: Publish test + condition: always() + \ No newline at end of file From 151883e13ac2e2fce0878c7580a50fb35d80acbe Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 11:16:15 +0200 Subject: [PATCH 09/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 119bfc62..549052f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ jobs: displayName: iOS test -- job: Ios_job +- job: Android_job pool: vmImage: 'ubuntu-latest' From 3a0d5a956b0afc6b2a4aaa5398a220c5380d4187 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:06:27 +0200 Subject: [PATCH 10/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 549052f1..17c86ff3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,12 +12,10 @@ variables: - group: Passwords resources: - repositories: - - repository: sys_kubernetes_templates - type: bitbucket - endpoint: Bitbucket - sistemas - name: situm/sys-kubernetes-templates.git - ref: SIS-144 + containers: + - container: node_slim + image: node:11.12-slim + options: "-u 0" jobs: @@ -67,5 +65,34 @@ jobs: displayName: Publish test condition: always() +- job: docker_job + pool: + vmImage: 'ubuntu-latest' + + container: node_slim + + steps: + - script: | + npm install + npm test + displayName: JS Test + + - script: | + npm run jsdoc + displayName: Generate JSDoc + - script: | + apt-get update && apt-get --assume-yes install zip + zip -r JSDoc ./docs/JSDoc/* + displayName: Archive artifacts + + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: 'JSDoc' + artifactName: 'JSDoc.zip' + displayName: Archive + + + + \ No newline at end of file From 579dc066166a2a99ad09a19b63263472843de3fa Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:08:52 +0200 Subject: [PATCH 11/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 17c86ff3..48e085e4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ resources: containers: - container: node_slim image: node:11.12-slim - options: "-u 0" + options: "-u root" jobs: @@ -82,7 +82,7 @@ jobs: displayName: Generate JSDoc - script: | - apt-get update && apt-get --assume-yes install zip + sudo apt-get update && apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 8fcc8eb3ac7c35430b3a2609654c76eefe2eeb7f Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:11:44 +0200 Subject: [PATCH 12/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48e085e4..76a052d7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -82,7 +82,7 @@ jobs: displayName: Generate JSDoc - script: | - sudo apt-get update && apt-get --assume-yes install zip + apt-get update && apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 0ed654d56a1217f3e92e4281868a017e8bc10e86 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:16:11 +0200 Subject: [PATCH 13/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 76a052d7..84efc361 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ resources: containers: - container: node_slim image: node:11.12-slim - options: "-u root" + options: '-u root' jobs: @@ -82,7 +82,7 @@ jobs: displayName: Generate JSDoc - script: | - apt-get update && apt-get --assume-yes install zip + apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 84ab868df21f25469edc8d8fa834871c4b50afc7 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:22:55 +0200 Subject: [PATCH 14/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 84efc361..2ed703cc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,9 @@ resources: image: node:11.12-slim options: '-u root' +pool: + vmImage: 'ubuntu-latest' + jobs: - job: Ios_job @@ -66,9 +69,7 @@ jobs: condition: always() - job: docker_job - pool: - vmImage: 'ubuntu-latest' - + container: node_slim steps: From 46833ddff56afac03b08e78977d5d3b81670a559 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:28:06 +0200 Subject: [PATCH 15/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 92 ++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ed703cc..5e7d7c1d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,59 +15,56 @@ resources: containers: - container: node_slim image: node:11.12-slim - options: '-u root' pool: vmImage: 'ubuntu-latest' jobs: -- job: Ios_job - pool: - vmImage: 'macOS-10.14' - - steps: - - script: | - sudo xcode-select -switch /Applications/Xcode_11.3.1.app - mkdir -p /Users/runner/.cocoapods/repos/ - wget https://github.com/CocoaPods/Specs/archive/master.zip - echo "########## UNZIPPING FILES ##########" - unzip -qq master.zip - echo -n "########## MOVING TO NEW FOLDER ##########" - mv Specs-master/Specs /Users/runner/.cocoapods/repos/ - displayName: Add repo - - - script: | - echo "foo" - #sudo xcode-select -switch /Applications/Xcode_11.3.1.app - #tests/scripts/copy_ios_resources.sh - #scripts/update_iosSDK_version.sh . - ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' - #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' - displayName: iOS test - - -- job: Android_job - pool: - vmImage: 'ubuntu-latest' - - steps: - - script: | - cd src/android - ./gradlew clean - displayName: Clean Android - - - script: | - tests/scripts/copy_android_resources.sh - cd src/android && ./gradlew test --continue - displayName: Android test - - task: PublishTestResults@2 - inputs: - testResultsFormat: 'JUnit' - testResultsFiles: 'src/android/app/build/test-results/*/*.xml' - displayName: Publish test - condition: always() - +#- job: Ios_job +# pool: +# vmImage: 'macOS-10.14' +# +# steps: +# - script: | +# sudo xcode-select -switch /Applications/Xcode_11.3.1.app +# mkdir -p /Users/runner/.cocoapods/repos/ +# wget https://github.com/CocoaPods/Specs/archive/master.zip +# echo "########## UNZIPPING FILES ##########" +# unzip -qq master.zip +# echo -n "########## MOVING TO NEW FOLDER ##########" +# mv Specs-master/Specs /Users/runner/.cocoapods/repos/ +# displayName: Add repo +# +# - script: | +# echo "foo" +# #sudo xcode-select -switch /Applications/Xcode_11.3.1.app +# #tests/scripts/copy_ios_resources.sh +# #scripts/update_iosSDK_version.sh . +# ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' +# #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' +# displayName: iOS test +# +# +#- job: Android_job +# +# steps: +# - script: | +# cd src/android +# ./gradlew clean +# displayName: Clean Android +# +# - script: | +# tests/scripts/copy_android_resources.sh +# cd src/android && ./gradlew test --continue +# displayName: Android test +# - task: PublishTestResults@2 +# inputs: +# testResultsFormat: 'JUnit' +# testResultsFiles: 'src/android/app/build/test-results/*/*.xml' +# displayName: Publish test +# condition: always() +# - job: docker_job container: node_slim @@ -83,6 +80,7 @@ jobs: displayName: Generate JSDoc - script: | + cat /etc/issue apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 0cb3239748142447a06c827be04f4710e9434488 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:29:49 +0200 Subject: [PATCH 16/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e7d7c1d..3db05a77 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,17 +70,17 @@ jobs: container: node_slim steps: - - script: | - npm install - npm test - displayName: JS Test - - - script: | - npm run jsdoc - displayName: Generate JSDoc + # - script: | + # npm install + # npm test + # displayName: JS Test +# + # - script: | + # npm run jsdoc + # displayName: Generate JSDoc - script: | - cat /etc/issue + whoami apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 4b9b0dd52b15c91d3e9f435c7362ed302e6880c8 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:36:51 +0200 Subject: [PATCH 17/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3db05a77..ba18010e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -80,6 +80,7 @@ jobs: # displayName: Generate JSDoc - script: | + su - root whoami apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* From 4c565675b1a15113a9fde96441ae12d2262d8903 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:40:48 +0200 Subject: [PATCH 18/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ba18010e..2aa53236 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,6 +15,7 @@ resources: containers: - container: node_slim image: node:11.12-slim + options: --user=root pool: vmImage: 'ubuntu-latest' From 8ab0480b72f0c1626a372582cd9489a1d39db6e6 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:52:19 +0200 Subject: [PATCH 19/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2aa53236..807ff818 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ resources: containers: - container: node_slim image: node:11.12-slim - options: --user=root + options: --user root pool: vmImage: 'ubuntu-latest' From e085ac83b36d9ca3adbf3dd7ff5b2f6c0f47cdd8 Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 12:58:27 +0200 Subject: [PATCH 20/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 807ff818..e46c687a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,6 @@ resources: containers: - container: node_slim image: node:11.12-slim - options: --user root pool: vmImage: 'ubuntu-latest' @@ -68,22 +67,19 @@ jobs: # - job: docker_job - container: node_slim - steps: - # - script: | - # npm install - # npm test - # displayName: JS Test -# - # - script: | - # npm run jsdoc - # displayName: Generate JSDoc + - script: | + npm install + npm test + displayName: JS Test + target: node_slim + + - script: | + npm run jsdoc + displayName: Generate JSDoc + target: node_slim - script: | - su - root - whoami - apt-get --assume-yes install zip zip -r JSDoc ./docs/JSDoc/* displayName: Archive artifacts From 83cc4718effbd63b8f413eb080a1a2290445723f Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 13:00:03 +0200 Subject: [PATCH 21/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e46c687a..dcda4678 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,8 +85,8 @@ jobs: - task: PublishBuildArtifacts@1 inputs: - pathToPublish: 'JSDoc' - artifactName: 'JSDoc.zip' + pathToPublish: 'JSDoc.zip' + artifactName: 'JSDoc' displayName: Archive From 685b27438f7cf0c56f69783e814bbb11126842bd Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 13:04:16 +0200 Subject: [PATCH 22/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 132 ++++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcda4678..d80477c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,75 +21,75 @@ pool: jobs: -#- job: Ios_job -# pool: -# vmImage: 'macOS-10.14' -# -# steps: -# - script: | -# sudo xcode-select -switch /Applications/Xcode_11.3.1.app -# mkdir -p /Users/runner/.cocoapods/repos/ -# wget https://github.com/CocoaPods/Specs/archive/master.zip -# echo "########## UNZIPPING FILES ##########" -# unzip -qq master.zip -# echo -n "########## MOVING TO NEW FOLDER ##########" -# mv Specs-master/Specs /Users/runner/.cocoapods/repos/ -# displayName: Add repo -# -# - script: | -# echo "foo" -# #sudo xcode-select -switch /Applications/Xcode_11.3.1.app -# #tests/scripts/copy_ios_resources.sh -# #scripts/update_iosSDK_version.sh . -# ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' -# #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' -# displayName: iOS test -# -# -#- job: Android_job -# -# steps: -# - script: | -# cd src/android -# ./gradlew clean -# displayName: Clean Android -# -# - script: | -# tests/scripts/copy_android_resources.sh -# cd src/android && ./gradlew test --continue -# displayName: Android test -# - task: PublishTestResults@2 -# inputs: -# testResultsFormat: 'JUnit' -# testResultsFiles: 'src/android/app/build/test-results/*/*.xml' -# displayName: Publish test -# condition: always() -# -- job: docker_job - +- job: Ios_job + pool: + vmImage: 'macOS-10.14' + steps: - - script: | - npm install - npm test - displayName: JS Test - target: node_slim + - script: | + sudo xcode-select -switch /Applications/Xcode_11.3.1.app + mkdir -p /Users/runner/.cocoapods/repos/ + wget https://github.com/CocoaPods/Specs/archive/master.zip + echo "########## UNZIPPING FILES ##########" + unzip -qq master.zip + echo -n "########## MOVING TO NEW FOLDER ##########" + mv Specs-master/Specs /Users/runner/.cocoapods/repos/ + displayName: Add repo + + - script: | + echo "foo" + #sudo xcode-select -switch /Applications/Xcode_11.3.1.app + #tests/scripts/copy_ios_resources.sh + #scripts/update_iosSDK_version.sh . + ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' + displayName: iOS test - - script: | - npm run jsdoc - displayName: Generate JSDoc - target: node_slim - - - script: | - zip -r JSDoc ./docs/JSDoc/* - displayName: Archive artifacts - - task: PublishBuildArtifacts@1 - inputs: - pathToPublish: 'JSDoc.zip' - artifactName: 'JSDoc' - displayName: Archive +- job: Android_job + + steps: + - script: | + cd src/android + ./gradlew clean + displayName: Clean Android + - script: | + tests/scripts/copy_android_resources.sh + cd src/android && ./gradlew test --continue + displayName: Android test + - task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'src/android/app/build/test-results/*/*.xml' + displayName: Publish test + condition: always() - +- job: docker_job - \ No newline at end of file + steps: + - script: | + npm install + npm test + displayName: JS Test + target: node_slim + + - script: | + npm run jsdoc + displayName: Generate JSDoc + target: node_slim + + - script: | + zip -r JSDoc ./docs/JSDoc/* + displayName: Archive artifacts + + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: 'JSDoc.zip' + artifactName: 'JSDoc' + displayName: Archive + + + + + \ No newline at end of file From 384e4bf0452e9f2cf966d46e98258f206b860c7c Mon Sep 17 00:00:00 2001 From: situmops Date: Wed, 15 Jul 2020 13:14:36 +0200 Subject: [PATCH 23/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d80477c8..cc1ddd52 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,12 +37,11 @@ jobs: displayName: Add repo - script: | - echo "foo" - #sudo xcode-select -switch /Applications/Xcode_11.3.1.app - #tests/scripts/copy_ios_resources.sh - #scripts/update_iosSDK_version.sh . - ##cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' - #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' + sudo xcode-select -switch /Applications/Xcode_11.3.1.app + tests/scripts/copy_ios_resources.sh + scripts/update_iosSDK_version.sh . + #cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' + cd src/ios && pod repo update && pod install && xcodebuild test -workspace SitumCordovaPlugin.xcworkspace -scheme CordovaLib -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' displayName: iOS test From c6a3155b7ba4ce0e5d723649673e7cff8cac3b31 Mon Sep 17 00:00:00 2001 From: situmops Date: Thu, 16 Jul 2020 11:40:28 +0200 Subject: [PATCH 24/26] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cc1ddd52..5ba3daa8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,8 +3,12 @@ # Add steps that build, run tests, deploy, and more: # https://aka.ms/yaml -trigger: -- azure-pipelines +trigger: +- master +- master-release +- release/* +- develop +- feature/* pr: none From 3040f1ed9d0d41f08bb380257b34635a5ce770eb Mon Sep 17 00:00:00 2001 From: Oscar Iglesias Date: Tue, 2 Mar 2021 16:56:05 +0100 Subject: [PATCH 25/26] SIS-290: Change repo.situm.es to repo.situm.com --- src/android/build.gradle | 2 +- src/android/situm.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/build.gradle b/src/android/build.gradle index 712f1aef..ef9335a8 100644 --- a/src/android/build.gradle +++ b/src/android/build.gradle @@ -22,7 +22,7 @@ allprojects { google() jcenter() maven { - url "https://repo.situm.es/artifactory/libs-release-local" + url "https://repo.situm.com/artifactory/libs-release-local" } maven { url "https://maven.google.com" diff --git a/src/android/situm.gradle b/src/android/situm.gradle index 9831b30f..a57f9be0 100644 --- a/src/android/situm.gradle +++ b/src/android/situm.gradle @@ -2,7 +2,7 @@ allprojects { repositories { jcenter() maven { - url "https://repo.situm.es/artifactory/libs-release-local" + url "https://repo.situm.com/artifactory/libs-release-local" } maven { url "https://maven.google.com" From 77c41dc31a1c3182273a4b4f1565c067ffed3b57 Mon Sep 17 00:00:00 2001 From: Adrian Martinez Regueira Date: Fri, 12 Mar 2021 16:57:45 +0100 Subject: [PATCH 26/26] Update compile and target SDKVersion to 30 --- src/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index accb4a78..615e619f 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 30 buildToolsVersion '27.0.3' defaultConfig { applicationId "es.plugin.situm" minSdkVersion 22 - targetSdkVersion 27 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"