diff --git a/.gitignore b/.gitignore index 3a51a0b..ae5ef54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,55 +1,6 @@ -**/*.swp -cover.out -*~ -minio -!*/ -site/ -**/*.test -**/*.sublime-workspace -/.idea/ -/Minio.iml -**/access.log -vendor/ -.DS_Store -*.syso -coverage.txt -.vscode/ -*.tar.bz2 -parts/ -prime/ -stage/ -.sia_temp/ -config.json -node_modules/ -mc.* -s3-check-md5* -xl-meta* -healing-* -inspect*.zip -200M* -hash-set -minio.RELEASE* -mc -nancy -inspects/* -.bin/ -*.gz -docs/debugging/s3-verify/s3-verify -docs/debugging/xl-meta/xl-meta -docs/debugging/s3-check-md5/s3-check-md5 -docs/debugging/hash-set/hash-set -docs/debugging/healing-bin/healing-bin -docs/debugging/inspect/inspect -docs/debugging/pprofgoparser/pprofgoparser -docs/debugging/reorder-disks/reorder-disks -docs/debugging/populate-hard-links/populate-hardlinks -docs/debugging/xattr/xattr -hash-set -healing-bin -inspect -pprofgoparser -reorder-disks -s3-check-md5 -s3-verify -xattr -xl-meta +.yardoc +Gemfile.lock +FileList +.scannerwork +.vscode +.puppet-lint.rc \ No newline at end of file diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock deleted file mode 100644 index e69de29..0000000 diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt deleted file mode 100644 index b9dfa60..0000000 --- a/.scannerwork/report-task.txt +++ /dev/null @@ -1,6 +0,0 @@ -projectKey=confdroid_minio -serverUrl=https://sonarqube.confdroid.com -serverVersion=25.5.0.107428 -dashboardUrl=https://sonarqube.confdroid.com/dashboard?id=confdroid_minio -ceTaskId=76df9d5d-ced7-4053-982a-0e7760cb56e9 -ceTaskUrl=https://sonarqube.confdroid.com/api/ce/task?id=76df9d5d-ced7-4053-982a-0e7760cb56e9 diff --git a/Jenkinsfile b/Jenkinsfile index 06a15ba..a1d4d7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,7 +90,8 @@ pipeline { sh ''' git checkout master git pull origin master - git branch -D development + git branch -D development || echo "No development branch to delete" + git branch -D jenkins-build || echo "No jenkins-build branch to delete" git branch -D jenkins-build-$BUILD_NUMBER git rm -f Jenkinsfile git rm -r --cached .vscode || echo "No .vscode to remove from git"