Skip to content
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

[ci] Added Github CI Build #83

Merged
merged 2 commits into from
Mar 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 78 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
---
name: OpenWISP Ipam CI Build

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
name: Python==${{ matrix.python-version }} | ${{ matrix.django-version }}
runs-on: ubuntu-20.04

strategy:
fail-fast: false
matrix:
python-version:
- 3.6
- 3.7
django-version:
- django~=2.2
- django~=3.0
- django~=3.1

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install python dependencies
run: |
pip install -U "pip==20.2.4" wheel setuptools
pip install ${{ matrix.django-version }}
pip install -U -r requirements-test.txt

- name: Install openwisp-ipam
run: pip install -e .

- name: Install jslint
run: sudo npm install -g jslint stylelint

- name: QA checks
run: ./run-qa-checks

- name: Tests
run: |
coverage run --source=openwisp_ipam runtests.py
# SAMPLE tests do not influence coverage, so we can speed up tests with --parallel
SAMPLE_APP=1 ./runtests.py --parallel --keepdb

- name: Upload Coverage
run: coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: |
python-${{ matrix.env.env }}
COVERALLS_PARALLEL: true

coveralls:
name: Finish Coveralls
needs: build
runs-on: ubuntu-latest
container: python:3-slim
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls
coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19 changes: 19 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"rules": {
"block-no-empty": null,
"color-no-invalid-hex": true,
"comment-empty-line-before": ["always", {
"ignore": ["stylelint-commands", "after-comment"]
}],
"declaration-colon-space-after": "always",
"indentation": [2, {
"except": ["value"]
}],
"max-empty-lines": 4,
"rule-empty-line-before": ["never-multi-line", {
"except": ["first-nested"],
"ignore": ["after-comment", "inside-block"]
}],
"unit-allowed-list": ["em", "rem", "%", "s", "px", "vh", "deg"]
}
}
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
openwisp-ipam
=============

.. image:: https://travis-ci.org/openwisp/openwisp-ipam.svg
:target: https://travis-ci.org/openwisp/openwisp-ipam
:alt: Build
.. image:: https://github.com/openwisp/openwisp-ipam/actions/workflows/ci.yml/badge.svg?branch=master
:target: https://github.com/openwisp/openwisp-ipam/actions/workflows/ci.yml?query=workflow%3AOpenWISP+Ipam+CI+Build%22
:alt: CI Build status

.. image:: https://coveralls.io/repos/openwisp/openwisp-ipam/badge.svg
:target: https://coveralls.io/r/openwisp/openwisp-ipam
Expand Down
15 changes: 4 additions & 11 deletions openwisp_ipam/static/openwisp-ipam/css/admin.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
.list-ip{
padding: 10px;
}

.subnet-visual{
margin: 10px 20px 0;
padding: 0;
}

section.subnet-visual{
overflow-anchor: none;
overflow-y: scroll;
height: 700px;
}

.subnet-visual a {
display: inline-block;
width: 120px;
Expand All @@ -26,24 +23,20 @@ section.subnet-visual{
font-weight: normal;
text-decoration: none !important;
}

.subnet-visual.ipv6 a {
font-size: 12px;
letter-spacing: -0.2px;
width: 240px;
padding: 8px 5px;
font-size: 12px;
letter-spacing: -0.2px;
width: 240px;
padding: 8px 5px;
}

.subnet-visual a:hover{
background: rgba(20, 102, 26, 1);
border: 1px solid rgba(0, 0, 0, 0.4);
}

.subnet-visual a.used{
background: rgba(149, 10, 10, 0.9);
border: 1px solid rgba(0, 0, 0, 0.2);
}

.subnet-visual a.used:hover{
background: rgba(149, 10, 10, 1);
border: 1px solid rgba(0, 0, 0, 0.4);
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TODO: change this when next version of openwisp_users is released
openwisp-users @ https://github.com/purhan/openwisp-users/tarball/master
openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@purhan was there a reason for using your fork or was this a mistake? 😄

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it was a leftover

openwisp-utils[rest]~=0.7.2
django>=2.2,<3.2
swapper~=1.1
Expand Down
4 changes: 4 additions & 0 deletions run-qa-checks
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ echo ''
echo 'Check JavaScript Linting'
jslint ./openwisp_ipam/static/openwisp-ipam/js/*.js

echo ''
echo 'Check CSS Linting'
stylelint ./openwisp_ipam/static/openwisp-ipam/css/*.css
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we should move something like this in openwisp-utils and run it on all modules! 😄


echo ''
echo 'Running checks for openwisp_ipam'

Expand Down