Skip to content

Commit e622c54

Browse files
katyukhakatyukha
committed
Merge branch 'gitlab-ci' into 'master'
Migrate code to gitlab See merge request katyukha/odoo-helper-scripts!14
2 parents 9ebeb14 + 8b1305e commit e622c54

40 files changed

+127
-83
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
*.pyc
77
/coverage/
88
/venv/
9+
/site/

‎.gitlab-ci.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
image: ubuntu:16.04
2+
3+
variables:
4+
CI_RUN: '1'
5+
ODOO_HELPER_INSTALL_PATH: "$CI_PROJECT_DIR"
6+
TEST_TMP_DIR: "/tmp/odoo-helper-tests"
7+
DEBIAN_FRONTEND: 'noninteractive'
8+
ALWAYS_ANSWER_YES: '1'
9+
LANG: 'C.UTF-8'
10+
LC_ALL: 'C.UTF-8'
11+
LANGUAGE: 'C.UTF-8'
12+
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
13+
APT_DIR: "$CI_PROJECT_DIR/.apt-cache"
14+
APT_STATE_LISTS: "$APT_DIR/lists"
15+
APT_CACHE_ARCHIVES: "$APT_DIR/archives"
16+
17+
cache:
18+
paths:
19+
- .cache
20+
# - /var/cache/apt/archives
21+
# - /var/lib/apt/lists
22+
23+
stages:
24+
- test
25+
- docs
26+
27+
tests:
28+
stage: test
29+
before_script:
30+
# Setup PIP Cache
31+
- mkdir -p .cache && chmod a+rwx -R .cache
32+
33+
# Install deps
34+
- apt-get update -qq && apt-get install -yqq adduser sudo locales ruby git
35+
- update-locale LANG=C.UTF-8 && update-locale LC_ALL=C.UTF-8 && update-locale LANGUAGE=C.UTF-8
36+
- gem install bashcov codecov simplecov-console
37+
38+
# Configure Odoo user
39+
- adduser -q odoo
40+
- echo ' odoo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
41+
- sudo -u odoo -HE git config --global user.email "[email protected]"
42+
- sudo -u odoo -HE git config --global user.name "test-oh"
43+
script:
44+
- bash install-system.bash
45+
- sudo -u odoo -HE bashcov tests/test.bash
46+
coverage: '/COVERAGE:.*\s+(\d{1,3}\.\d{2}\%)/'
47+
48+
pages:
49+
stage: docs
50+
image: python:alpine
51+
52+
before_script:
53+
- pip install mkdocs mkdocs-cinder
54+
55+
script:
56+
- mkdocs build
57+
- mv site public
58+
artifacts:
59+
paths:
60+
- public
61+
only:
62+
- master

‎.simplecov

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
require 'simplecov'
2-
require 'codecov'
2+
#require 'codecov'
33
require 'simplecov-console'
44

55
SimpleCov.start do
66
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
7-
SimpleCov::Formatter::Codecov,
7+
#SimpleCov::Formatter::Codecov,
88
SimpleCov::Formatter::Console
99
])
1010
add_filter ".git/"
11+
add_filter "/tmp/odoo-helper-tests/"
1112
add_filter "run_docker_test.bash"
1213
end

‎.travis.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Odoo helper scripts collection
22

3-
| Master | [![Build Status](https://travis-ci.org/katyukha/odoo-helper-scripts.svg?branch=master)](https://travis-ci.org/katyukha/odoo-helper-scripts) | [![Coverage Status](https://codecov.io/gh/katyukha/odoo-helper-scripts/graph/badge.svg)](https://codecov.io/gh/katyukha/odoo-helper-scripts) | [![Release](https://img.shields.io/github/release/katyukha/odoo-helper-scripts.svg)](https://github.com/katyukha/odoo-helper-scripts/releases) | [![Release Date](https://img.shields.io/github/release-date/katyukha/odoo-helper-scripts.svg)](https://github.com/katyukha/odoo-helper-scripts/releases) | [![Last Commit](https://img.shields.io/github/last-commit/katyukha/odoo-helper-scripts/master.svg)](https://github.com/katyukha/odoo-helper-scripts/commits/master) | [![CHANGELOG](https://img.shields.io/badge/CHANGELOG-master-brightgreen.svg)](https://github.com/katyukha/odoo-helper-scripts/blob/master/CHANGELOG.md) |
3+
| Master | [![pipeline status](https://gitlab.com/katyukha/odoo-helper-scripts/badges/master/pipeline.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/commits/master) | [![coverage report](https://gitlab.com/katyukha/odoo-helper-scripts/badges/master/coverage.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/commits/master)| [![CHANGELOG](https://img.shields.io/badge/CHANGELOG-master-brightgreen.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/blob/master/CHANGELOG.md) |
44
| ------------- |:---------------|:--------------|:------------|:------------|:------------|:----------|
5-
| Dev | [![Build Status](https://travis-ci.org/katyukha/odoo-helper-scripts.svg?branch=dev)](https://travis-ci.org/katyukha/odoo-helper-scripts) | [![Coverage Status](https://codecov.io/gh/katyukha/odoo-helper-scripts/branch/dev/graph/badge.svg)](https://codecov.io/gh/katyukha/odoo-helper-scripts/branch/dev) | | | [![Last Commit](https://img.shields.io/github/last-commit/katyukha/odoo-helper-scripts/dev.svg)](https://github.com/katyukha/odoo-helper-scripts/commits/dev) | [![CHANGELOG](https://img.shields.io/badge/CHANGELOG-dev-yellow.svg)](https://github.com/katyukha/odoo-helper-scripts/blob/dev/CHANGELOG.md) |
5+
| Dev | [![pipeline status](https://gitlab.com/katyukha/odoo-helper-scripts/badges/dev/pipeline.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/commits/dev) | [![coverage report](https://gitlab.com/katyukha/odoo-helper-scripts/badges/dev/coverage.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/commits/dev) | [![CHANGELOG](https://img.shields.io/badge/CHANGELOG-dev-yellow.svg)](https://gitlab.com/katyukha/odoo-helper-scripts/blob/dev/CHANGELOG.md) |
66

77
## Features
88

@@ -45,7 +45,7 @@
4545
***Note*** Documentaion in this readme, or in other sources, may not be up to date!!!
4646
So use ``--help`` option, which is available for most of commands.
4747

48-
- [Documentation](docs/README.md)
48+
- [Documentation](docs/index.md)
4949
- [Installation](docs/installation.md)
5050
- [Frequently used commands](docs/frequently-used-commands.md)
5151

@@ -65,7 +65,7 @@ To install *odoo-helper-scripts* system-wide do folowing:
6565

6666
```bash
6767
# Install odoo-helper-scripts
68-
wget -O - https://raw.githubusercontent.com/katyukha/odoo-helper-scripts/master/install-system.bash | sudo bash -s
68+
wget -O - https://gitlab.com/katyukha/odoo-helper-scripts/raw/master/install-system.bash | sudo bash -s
6969

7070
# Install system dependencies required for odoo-helper-scripts
7171
# NOTE: Works only on debian-based systems
@@ -76,7 +76,7 @@ or more explicit way:
7676

7777
```bash
7878
# Download installation script
79-
wget -O /tmp/odoo-helper-install.bash https://raw.githubusercontent.com/katyukha/odoo-helper-scripts/master/install-system.bash;
79+
wget -O /tmp/odoo-helper-install.bash https://gitlab.com/katyukha/odoo-helper-scripts/raw/master/install-system.bash;
8080

8181
# Install odoo-helper-scripts
8282
sudo bash /tmp/odoo-helper-install.bash;
@@ -116,7 +116,7 @@ Also there are some aliases for common commands:
116116
- odoo-helper-server
117117
- odoo-helper-test
118118

119-
For more info look at [documentation](docs/README.md). (currently documentation status is *work-in-progress*).
119+
For more info look at [documentation](docs/index.md). (currently documentation status is *work-in-progress*).
120120
Also look at [Frequently used commands](docs/frequently-used-commands.md)
121121

122122
Also look at [odoo-helper-scripts tests](./tests/test.bash) to get complete usage example (look for *Start test* comment).

‎bin/odoo-helper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -e; # Fail on errors
2222

2323
if [ -z $ODOO_HELPER_LIB ]; then
2424
echo "Odoo-helper-scripts seems not been installed correctly.";
25-
echo "Reinstall it (see Readme on https://github.com/katyukha/odoo-helper-scripts/)";
25+
echo "Reinstall it (see Readme on https://gitlab.com/katyukha/odoo-helper-scripts/)";
2626
exit 1;
2727
fi
2828

‎bin/odoo-helper-addons

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set -e; # Fail on errors
2323

2424
if [ -z $ODOO_HELPER_LIB ]; then
2525
echo "Odoo-helper-scripts seems not been installed correctly.";
26-
echo "Reinstall it (see Readme on https://github.com/katyukha/odoo-helper-scripts/)";
26+
echo "Reinstall it (see Readme on https://gitlab.com/katyukha/odoo-helper-scripts/)";
2727
exit 1;
2828
fi
2929

‎bin/odoo-helper-db

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -e; # Fail on errors
2222

2323
if [ -z $ODOO_HELPER_LIB ]; then
2424
echo "Odoo-helper-scripts seems not been installed correctly.";
25-
echo "Reinstall it (see Readme on https://github.com/katyukha/odoo-helper-scripts/)";
25+
echo "Reinstall it (see Readme on https://gitlab.com/katyukha/odoo-helper-scripts/)";
2626
exit 1;
2727
fi
2828

‎bin/odoo-helper-fetch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -e; # Fail on errors
2222

2323
if [ -z $ODOO_HELPER_LIB ]; then
2424
echo "Odoo-helper-scripts seems not been installed correctly.";
25-
echo "Reinstall it (see Readme on https://github.com/katyukha/odoo-helper-scripts/)";
25+
echo "Reinstall it (see Readme on https://gitlab.com/katyukha/odoo-helper-scripts/)";
2626
exit 1;
2727
fi
2828

‎bin/odoo-helper-log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -e; # Fail on errors
2222

2323
if [ -z $ODOO_HELPER_LIB ]; then
2424
echo "Odoo-helper-scripts seems not been installed correctly.";
25-
echo "Reinstall it (see Readme on https://github.com/katyukha/odoo-helper-scripts/)";
25+
echo "Reinstall it (see Readme on https://gitlab.com/katyukha/odoo-helper-scripts/)";
2626
exit 1;
2727
fi
2828

0 commit comments

Comments
 (0)