Skip to content

Khorevaa patch 1 #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
acf518b
Merged release/2.1.1 into master
artbear Mar 2, 2017
2940d7c
Merge branch 'release/v2.2.0'
nixel2007 Aug 24, 2017
5024366
Пыщ версии
EvilBeaver Sep 29, 2017
ead8b0a
Revert "Пыщ версии"
EvilBeaver Sep 29, 2017
ac02cab
Изменил номер версии
artbear Oct 10, 2017
f8eab94
Merge branch 'release/2.3.0'
artbear Oct 10, 2017
f43a465
Merge remote-tracking branch 'origin/master'
artbear Oct 10, 2017
dbb748a
Merge branch 'release/2.4.0'
nixel2007 Dec 11, 2017
fa128c5
Merge branch 'release/2.4.1'
nixel2007 Jan 25, 2018
14a1fdc
Merge branch 'release/2.4.2'
nixel2007 Jan 25, 2018
2846656
уровень журналирования не передавался в менеджер синхронизации
Mar 8, 2018
98bb7cd
Merge pull request #116 from Dumsik/master
artbear Mar 9, 2018
5a195e7
Revert "уровень журналирования не передавался в менеджер синхронизации"
artbear Mar 9, 2018
601273e
Merge pull request #117 from oscript-library/revert-116-master
artbear Mar 9, 2018
b813d3c
Update МенеджерСинхронизации.os
astrizhachuk Jul 8, 2018
3423cae
Update МенеджерСинхронизации.os
astrizhachuk Jul 9, 2018
fae69e4
Merge pull request #141 from AlexStrizh/master
EvilBeaver Jul 9, 2018
5c61b4f
Баг при использовании флага all
astrizhachuk Jul 10, 2018
33a7261
Merge pull request #1 from AlexStrizh/AlexStrizh-patch-2
astrizhachuk Jul 10, 2018
c15c8d1
Прогон новым сонаром
EvilBeaver Aug 9, 2018
e679986
whitespace
EvilBeaver Aug 9, 2018
cb543d6
Исправлены неверные шаги с английской буквой "с"
artbear Aug 10, 2018
f21645f
улучшил зависимости от последних версий пакетов
artbear Aug 10, 2018
7042e68
Увеличил номер версии на 2.4.3
artbear Aug 10, 2018
8518d69
Merge branch 'hotfix/fix-for-new-1commands'
artbear Aug 10, 2018
3282d15
Merge pull request #145 from AlexStrizh/patch-2
khorevaa Aug 22, 2018
2f5875e
Create LICENSE
EvilBeaver Oct 31, 2018
a00263d
typo
witales May 6, 2019
05b426e
typo
witales May 6, 2019
9c652b1
typo
witales May 6, 2019
ec95f27
Не верное свойство
thedemoncat May 7, 2019
ac2ea29
Освежил зависимости
thedemoncat May 7, 2019
647a596
Merge pull request #198 from ZhdanovR/release/3.0.0
khorevaa May 7, 2019
d439216
добавил синонимы
thedemoncat May 8, 2019
7d86e87
Переменные окружения
thedemoncat May 8, 2019
c0b9bd8
Merge pull request #199 from ZhdanovR/release/3.0.0
khorevaa May 8, 2019
102e3a4
Merge branch 'release/3.0.0' into typo
khorevaa May 8, 2019
3237744
Merge pull request #197 from witales/typo
khorevaa May 8, 2019
f012e34
Чуть чуть красоты
khorevaa Apr 5, 2019
463d820
Корректировка версии
khorevaa May 13, 2019
99b597b
Finish 3.0.0
khorevaa May 13, 2019
f31c2b0
Эта строка лога описывала перемещение каталогов из временной папки в …
Oct 10, 2019
d984d3a
Merge pull request #216 from leemuar/excessive-debug-log
EvilBeaver Oct 11, 2019
944e32e
Исправления тестов
GenVP Dec 24, 2019
f19421f
Исправление проверяемого сообщения
GenVP Dec 24, 2019
1db3c21
Отключения пакетного теста до окончания доработки пакетной синхронизации
GenVP Dec 25, 2019
a6d8eb1
Исправление тестов
GenVP Dec 25, 2019
27037bc
Исправление тестов
GenVP Dec 25, 2019
672899c
Исправление тестов
GenVP Dec 26, 2019
cfd6d57
Merge pull request #223 from GenVP/hotfix/fix_tests
EvilBeaver Dec 27, 2019
2a0fb2c
fix Ошибка включения плагинов
khorevaa Jan 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 7 additions & 52 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ pipeline {
}
else
echo 'no testing task'

def scannerHome = tool 'sonar-scanner';
withSonarQubeEnv('silverbulleters') {
sh "${scannerHome}/bin/sonar-scanner"
}
}

}

}

stage('Тестирование кода пакета LINUX') {
/* stage('Тестирование кода пакета LINUX') {

agent { label 'master' }

Expand All @@ -38,57 +43,7 @@ pipeline {
}

}
*/

stage('Сборка пакета') {

agent { label 'windows' }

steps {
checkout scm

bat 'erase /Q *.ospx'
bat 'chcp 65001 > nul && call opm build .'

stash includes: '*.ospx', name: 'package'
archiveArtifacts '*.ospx'
}

}

stage('Публикация в хабе') {
when {
branch 'master'
}
agent { label 'master' }
steps {
sh 'rm -f *.ospx'
unstash 'package'

sh '''
artifact=`ls -1 *.ospx`
basename=`echo $artifact | sed -r 's/(.+)-.*(.ospx)/\\1/'`
cp $artifact $basename.ospx
sudo rsync -rv *.ospx /var/www/hub.oscript.io/download/$basename/
'''.stripIndent()
}
}

stage('Публикация в нестабильном хабе') {
when {
branch 'develop'
}
agent { label 'master' }
steps {
sh 'rm -f *.ospx'
unstash 'package'

sh '''
artifact=`ls -1 *.ospx`
basename=`echo $artifact | sed -r 's/(.+)-.*(.ospx)/\\1/'`
cp $artifact $basename.ospx
sudo rsync -rv *.ospx /var/www/hub.oscript.io/dev-channel/$basename/
'''.stripIndent()
}
}
}
}
Loading