From d9cbcfad65cb09a1a3e41035913d0b43b403c2a0 Mon Sep 17 00:00:00 2001 From: Artem Kuznetsov Date: Fri, 17 Jun 2022 14:57:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8;=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=8B=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 29 ----------------------------- packagedef | 4 ++-- travis.sh | 34 ---------------------------------- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 .travis.yml delete mode 100644 travis.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 00b8fca..0000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -sudo: required -dist: trusty -addons: - sonarqube: true -jdk: - - openjdk11 -git: - depth: false -before_install: - - chmod +x travis.sh - - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF - - echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-official.list - - sudo apt-get update - - sudo apt-get install mono-complete mono-devel dos2unix - - wget -O os.deb http://oscript.io/downloads/latest/x64/deb - - sudo dpkg -i os.deb; sudo apt install -f - - oscript -install: - - sudo opm install - - sudo opm install 1testrunner - - sudo opm install v8runner - - sudo opm install moskito - -cache: - directories: - - '$HOME/.m2/repository' - - '$HOME/.sonar/cache' -script: - - ./travis.sh \ No newline at end of file diff --git a/packagedef b/packagedef index 2ee1127..0b2c040 100644 --- a/packagedef +++ b/packagedef @@ -1,10 +1,10 @@  Описание.Имя("irac") - .Версия("1.2.2") + .Версия("1.3.0") .Автор("Artem Kuznetsov") .АдресАвтора("ArKuznetsov@gmail.com") .Описание("Библиотека администрирования кластера серверов 1С") - .ВерсияСреды("1.3.0") + .ВерсияСреды("1.6.0") .ЗависитОт("fs") .ЗависитОт("logos", "1.0.2") .ЗависитОт("tempfiles") diff --git a/travis.sh b/travis.sh deleted file mode 100644 index dc9d0e7..0000000 --- a/travis.sh +++ /dev/null @@ -1,34 +0,0 @@ - -#!/bin/bash -set -e - -sudo opm run coverage - -temp=`cat packagedef | grep ".Версия(" | sed 's|[^"]*"||' | sed -r 's/".+//'` -version=${temp##*|} - -if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - sonar-scanner \ - -Dsonar.host.url=$SONAR_HOST \ - -Dsonar.analysis.mode=issues \ - -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST \ - -Dsonar.github.repository=$TRAVIS_REPO_SLUG \ - -Dsonar.github.oauth=$SONAR_GITHUB_TOKEN \ - -Dsonar.login=$SONAR_TOKEN \ - -Dsonar.scm.enabled=true \ - -Dsonar.scm.provider=git \ - -Dsonar.scanner.skip=false \ - -Dsonar.branch.name=master - - elif [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - sonar-scanner \ - -Dsonar.host.url=$SONAR_HOST \ - -Dsonar.login=$SONAR_TOKEN \ - -Dsonar.projectVersion=$version \ - -Dsonar.scm.enabled=true \ - -Dsonar.scm.provider=git \ - -Dsonar.scanner.skip=false \ - -Dsonar.branch.name=master - fi -fi \ No newline at end of file