diff options
| author | cbdev <cb@cbcdn.com> | 2021-07-01 23:09:10 +0200 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2021-07-01 23:09:10 +0200 |
| commit | 5bb4bbc08ba98bf8e65c57409040be1e74b9e6da (patch) | |
| tree | 7d10ff37242b71d484f920c5cb1b3ddea9074a48 | |
| parent | 7526e2b02716760a6ed05b6f35f7e5a67cebdb87 (diff) | |
| parent | 124fe4d819f221bc4c0a873c2cf536a659c2d705 (diff) | |
| download | midimonster-5bb4bbc08ba98bf8e65c57409040be1e74b9e6da.tar.gz midimonster-5bb4bbc08ba98bf8e65c57409040be1e74b9e6da.tar.bz2 midimonster-5bb4bbc08ba98bf8e65c57409040be1e74b9e6da.zip | |
Merge branch 'master' of ssh://github.com/cbdevnet/midimonster
| -rw-r--r-- | assets/ci-config | 4 | ||||
| -rwxr-xr-x | assets/ci.sh | 2 | ||||
| -rwxr-xr-x | installer.sh | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/assets/ci-config b/assets/ci-config index ac94661..6e94df6 100644 --- a/assets/ci-config +++ b/assets/ci-config @@ -17,7 +17,7 @@ buildTypes.each{ node() { skipDefaultCheckout() stage('Checkout') { - checkout scm + checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: false], [$class: 'CleanBeforeCheckout', deleteUntrackedNestedRepositories: true]], userRemoteConfigs: [[credentialsId: 'github_mm_key', url: 'https://github.com/cbdevnet/midimonster.git']]]) } stage("$it Build"){ @@ -47,7 +47,7 @@ builds.Test = { node() { skipDefaultCheckout() stage('Checkout') { - checkout scm + checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: false], [$class: 'CleanBeforeCheckout', deleteUntrackedNestedRepositories: true]], userRemoteConfigs: [[credentialsId: 'github_mm_key', url: 'https://github.com/cbdevnet/midimonster.git']]]) } stage('Test') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { diff --git a/assets/ci.sh b/assets/ci.sh index 0bc6d4a..e633875 100755 --- a/assets/ci.sh +++ b/assets/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# shellcheck disable=SC2001,SC2181 +# shellcheck disable=SC2001,SC2181,SC1117 ################################################ SETUP ################################################ dep_build_core=( diff --git a/installer.sh b/installer.sh index 2b9f799..4a8671e 100755 --- a/installer.sh +++ b/installer.sh @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC1117 ################################################ SETUP ################################################ dependencies=( |