Skip to content

Commit cd1b4b1

Browse files
khorevaakhorevaa
committed
Finish 0.6.6
2 parents fdb0910 + 63391c9 commit cd1b4b1

30 files changed

+1150
-655
lines changed

‎.gitignore

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
exec.log
22
test-reports/*.*
33
*.ospx
4-
bin/*
4+
bin/*
5+
test*.xml
6+
bdd-*.xml
7+
8+
*.ospx
9+
10+
coverage/*
11+
12+
.vscode/*

‎.travis.yml

+47-30
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,79 @@
1-
sudo: required
1+
language: generic
22

3-
dist: trusty
3+
sudo: required
44

55
notifications:
66
email: false
7-
8-
before_install:
9-
- if [ $TRAVIS_OS_NAME == "linux" ]; then
10-
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
11-
sh -e /etc/init.d/xvfb start;
12-
sleep 3;
13-
fi
14-
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
15-
- echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-official.list
16-
- sudo apt-get update
17-
- sudo apt-get install mono-complete mono-devel
18-
- wget -O os.deb http://oscript.io/downloads/latest/onescript-engine_1.0.18_all.deb
19-
- sudo dpkg -i *.deb; sudo apt install -f
20-
- sudo oscript /usr/share/oscript/lib/opm/src/opm.os install opm
21-
22-
install:
23-
- sudo oscript /usr/share/oscript/lib/opm/src/opm.os install 1testrunner
24-
- sudo oscript /usr/share/oscript/lib/opm/src/opm.os install 1bdd
25-
- sudo oscript /usr/share/oscript/lib/opm/src/opm.os install
7+
8+
services:
9+
- docker
10+
11+
addons:
12+
sonarqube: true
13+
14+
before_install:
15+
# Load cached docker images
16+
- if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
17+
18+
before_cache:
19+
# Save tagged docker images
20+
- >
21+
mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
22+
| xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
23+
24+
install:
25+
- docker pull harmit/ci-image
2626

2727
env:
2828
global:
29-
- CHANNEL=dev
30-
29+
- CHANNEL=dev
30+
- PACKAGE_NAME=v8storage
31+
matrix:
32+
- OSCRIPT_VERSION=1_0_19
33+
- OSCRIPT_VERSION=1_0_20
34+
- OSCRIPT_VERSION=night-build
35+
matrix:
36+
allow_failures:
37+
- env: OSCRIPT_VERSION=night-build
3138
cache:
3239
directories:
3340
- '$HOME/.m2/repository'
3441
- '$HOME/.sonar/cache'
42+
- '$HOME/docker'
43+
44+
script:
45+
- docker version
46+
- docker run -it -e OSCRIPT_VERSION=$OSCRIPT_VERSION -v $(pwd):/work_dir harmit/ci-image sh -c 'cd /work_dir; sh /work_dir/travis-ci.sh; exit' | tee /tmp/test.log
47+
- grep 'Результат прогона тестов <Да>' /tmp/test.log
48+
49+
after_success:
50+
- bash <(curl -s https://codecov.io/bash)
51+
- ./sonar-qube.sh
52+
53+
3554
jobs:
3655
include:
37-
#- stage: Тестирование
38-
# script: oscript /usr/share/oscript/lib/opm/src/opm.os test
3956
- stage: Сборка и публикация github & hub.oscript.io
40-
script: skip
57+
script: skip
4158
before_deploy:
42-
- oscript /usr/share/oscript/lib/opm/src/opm.os build ./
59+
- docker run -it -v $(pwd):/work_dir harmit/ci-image sh -c 'cd /work_dir; opm build ./ ; exit'
4360
deploy:
4461
- provider: releases
4562
api_key: "$GITHUB_OAUTH_TOKEN"
4663
file_glob: true
47-
file: v8storage*.ospx
64+
file: $PACKAGE_NAME*.ospx
4865
skip_cleanup: true
4966
on:
5067
branch: master
5168
tags: true
5269
- provider: script
5370
skip_cleanup: true
54-
script: oscript /usr/share/oscript/lib/opm/src/opm.os push --token $GITHUB_OAUTH_TOKEN --channel dev --file ./v8storage-*.ospx;
71+
script: docker run -it -v $(pwd):/work_dir evilbeaver/onescript:1.0.19 sh -c 'cd /work_dir; opm push --token $GITHUB_OAUTH_TOKEN --channel dev --file ./$PACKAGE_NAME-*.ospx; exit'
5572
on:
5673
branch: develop
5774
- provider: script
5875
skip_cleanup: true
59-
script: oscript /usr/share/oscript/lib/opm/src/opm.os push --token $GITHUB_OAUTH_TOKEN --channel stable --file ./v8storage-*.ospx;
76+
script: docker run -it -v $(pwd):/work_dir evilbeaver/onescript:1.0.19 sh -c 'cd /work_dir; opm push --token $GITHUB_OAUTH_TOKEN --channel stable --file ./$PACKAGE_NAME-*.ospx; exit'
6077
on:
6178
branch: master
6279
tags: true

‎LICENSE.md renamed to ‎LICENSE

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
The MIT License (MIT)
2-
=====================
3-
4-
Copyright © `2017` `Khorev Aleksey <[email protected]>`
5-
6-
Permission is hereby granted, free of charge, to any person
7-
obtaining a copy of this software and associated documentation
8-
files (the “Software”), to deal in the Software without
9-
restriction, including without limitation the rights to use,
10-
copy, modify, merge, publish, distribute, sublicense, and/or sell
11-
copies of the Software, and to permit persons to whom the
12-
Software is furnished to do so, subject to the following
13-
conditions:
14-
15-
The above copyright notice and this permission notice shall be
16-
included in all copies or substantial portions of the Software.
17-
18-
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
19-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
20-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
22-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
23-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25-
OTHER DEALINGS IN THE SOFTWARE.
26-
1+
The MIT License (MIT)
2+
=====================
3+
4+
Copyright © `2017` `Khorev Aleksey <[email protected]>`
5+
6+
Permission is hereby granted, free of charge, to any person
7+
obtaining a copy of this software and associated documentation
8+
files (the “Software”), to deal in the Software without
9+
restriction, including without limitation the rights to use,
10+
copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the
12+
Software is furnished to do so, subject to the following
13+
conditions:
14+
15+
The above copyright notice and this permission notice shall be
16+
included in all copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
19+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
20+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
22+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
23+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25+
OTHER DEALINGS IN THE SOFTWARE.
26+

‎epf/ОбработкаКонвертацииMXLJSON/ОбработкаКонвертацииMXLJSON.xml

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
3-
<ExternalDataProcessor uuid="b909bc4a-420b-11e7-3b8d-bcee7b73c08f">
4-
<InternalInfo>
5-
<xr:ContainedObject>
6-
<xr:ClassId>c3831ec8-d8d5-4f93-8a22-f9bfae07327f</xr:ClassId>
7-
<xr:ObjectId>b909bc5e-420b-11e7-3b8d-bcee7b73c08f</xr:ObjectId>
8-
</xr:ContainedObject>
9-
<xr:GeneratedType name="ExternalDataProcessorObject.ОбработкаКонвертацииMXLJSON" category="Object">
10-
<xr:TypeId>b909bc54-420b-11e7-3b8d-bcee7b73c08f</xr:TypeId>
11-
<xr:ValueId>b909bc55-420b-11e7-3b8d-bcee7b73c08f</xr:ValueId>
12-
</xr:GeneratedType>
13-
</InternalInfo>
14-
<Properties>
15-
<Name>ОбработкаКонвертацииMXLJSON</Name>
16-
<Synonym/>
17-
<Comment/>
18-
<DefaultForm/>
19-
<AuxiliaryForm/>
20-
</Properties>
21-
<ChildObjects/>
22-
</ExternalDataProcessor>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
3+
<ExternalDataProcessor uuid="b909bc4a-420b-11e7-3b8d-bcee7b73c08f">
4+
<InternalInfo>
5+
<xr:ContainedObject>
6+
<xr:ClassId>c3831ec8-d8d5-4f93-8a22-f9bfae07327f</xr:ClassId>
7+
<xr:ObjectId>b909bc5e-420b-11e7-3b8d-bcee7b73c08f</xr:ObjectId>
8+
</xr:ContainedObject>
9+
<xr:GeneratedType name="ExternalDataProcessorObject.ОбработкаКонвертацииMXLJSON" category="Object">
10+
<xr:TypeId>b909bc54-420b-11e7-3b8d-bcee7b73c08f</xr:TypeId>
11+
<xr:ValueId>b909bc55-420b-11e7-3b8d-bcee7b73c08f</xr:ValueId>
12+
</xr:GeneratedType>
13+
</InternalInfo>
14+
<Properties>
15+
<Name>ОбработкаКонвертацииMXLJSON</Name>
16+
<Synonym/>
17+
<Comment/>
18+
<DefaultForm/>
19+
<AuxiliaryForm/>
20+
</Properties>
21+
<ChildObjects/>
22+
</ExternalDataProcessor>
2323
</MetaDataObject>

0 commit comments

Comments
 (0)