Skip to content

Commit

Permalink
Merge branch 'develop' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolaiRidani committed Apr 1, 2021
2 parents 553c8cd + 5fccf9d commit 291eb08
Show file tree
Hide file tree
Showing 10 changed files with 267 additions and 149 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -27,3 +27,4 @@ Use 'x' to check each item: [x] I have ...
* [ ] I have opened this pull request against ``develop``
* [ ] I have updated the **CHANGELOG.rst**
* [ ] I have added or modified the tests when changing logic
* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on [Slack](https://www.django-cms.org/slack) to find a “pr review buddy” who is going to review your pull request.
27 changes: 27 additions & 0 deletions .github/workflows/docs.yml
@@ -0,0 +1,27 @@
name: Docs

on: [push, pull_request]

jobs:
docs:
runs-on: ubuntu-latest
name: docs
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- run: python -m pip install -r docs/requirements.txt
- name: Build docs
run: |
cd docs
sphinx-build -b dirhtml -n -d build/doctrees . build/dirhtml
22 changes: 22 additions & 0 deletions .github/workflows/frontend.yml
@@ -0,0 +1,22 @@
name: django CMS frontend.yml

on: [push]

jobs:
frontend:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [6.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm install -g gulp@3.9.1
- run: |
gulp tests:unit
gulp lint
40 changes: 40 additions & 0 deletions .github/workflows/linters.yml
@@ -0,0 +1,40 @@
name: django CMS linters.yml

on: [push]

jobs:
flake8:
name: flake8
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- run: pip install --upgrade flake8
- name: flake8
uses: liskin/gh-problem-matcher-wrap@v1
with:
linters: flake8
run: |
flake8 --exit-zero
# TODO: re-enable it in another PR, want to keep
# the actions Pr clean
# isort:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v2
# - name: Set up Python
# uses: actions/setup-python@v2
# with:
# python-version: 3.9
# - run: python -m pip install isort
# - name: isort
# uses: liskin/gh-problem-matcher-wrap@v1
# with:
# linters: isort
# run: isort --check --diff cms
135 changes: 135 additions & 0 deletions .github/workflows/test.yml
@@ -0,0 +1,135 @@
name: django CMS test.yml

on: [push]

jobs:
database-postgres:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two
requirements-file: [
django-2.2.txt,
django-3.0.txt,
django-3.1.txt,
]
os: [
ubuntu-20.04,
]

services:
postgres:
image: postgres:12
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
ports:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}

uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
sudo apt install gettext gcc -y
python -m pip install --upgrade pip
pip install pytest
pip install -r test_requirements/${{ matrix.requirements-file }}
python setup.py install
- name: Test with django test runner
run: |
python manage.py test
database-mysql:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two
requirements-file: [
django-2.2.txt,
django-3.0.txt,
django-3.1.txt,
]
os: [
ubuntu-20.04,
]

services:
mysql:
image: mysql:5.7
env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: djangocms_test
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3


steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}

uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
sudo apt install gettext gcc -y
python -m pip install --upgrade pip
pip install pytest
pip install -r test_requirements/${{ matrix.requirements-file }}
python setup.py install
- name: Test with django test runner
run: |
python manage.py test
env:
DATABASE_URL: mysql://root@127.0.0.1/djangocms_test

database-sqlite:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two
requirements-file: [
django-2.2.txt,
django-3.0.txt,
django-3.1.txt,
]
os: [
ubuntu-20.04,
]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}

uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
sudo apt install gettext gcc -y
python -m pip install --upgrade pip
pip install pytest
pip install -r test_requirements/${{ matrix.requirements-file }}
python setup.py install
- name: Test with django test runner
run: |
python manage.py test
env:
DATABASE_URL: sqlite://localhost/testdb.sqlite
141 changes: 0 additions & 141 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -12,6 +12,10 @@ Unreleased
* Fixed 66622 bad Title.path in multilingual sites when parent slug is created or modified
* Added django-treebeard 4.5.1 support, previously pinned django-treebeard<4.5 to avoid breaking changes introduced
* Updated documentation links
* Added support for Github Actions based CI.
* Added Support for testing frontend, docs, test and linting in different/parallel CI pipelines.
* Remove travis integration from the project as the project has moved to Github Actions.


3.8.0 (2020-10-28)
==================
Expand Down

0 comments on commit 291eb08

Please sign in to comment.