Skip to content

Commit 2821d7b

Browse files
authored
Merge branch 'master' into python-publish-workflow
2 parents 4b950a7 + 3d35d46 commit 2821d7b

File tree

31 files changed

+9823
-2842
lines changed

31 files changed

+9823
-2842
lines changed

.github/workflows/integration-tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
paths-ignore:
1111
- php/sqlcommenter-php/packages/sqlcommenter-laravel/**
1212
- php/sqlcommenter-php/samples/sqlcommenter-laravel/**
13+
1314
jobs:
1415
integrationtests:
1516
runs-on: ubuntu-latest

.github/workflows/laravel-publish-to-repo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish to Sqlcommenter-php repository
1+
name: Publish to "sqlcommenter-laravel-php" repository
22
on:
33
push:
44
branches:
@@ -17,5 +17,5 @@ jobs:
1717
with:
1818
source-directory: 'php/sqlcommenter-php/packages/sqlcommenter-laravel'
1919
destination-github-username: 'google'
20-
destination-repository-name: 'sqlcommenter-php'
20+
destination-repository-name: 'sqlcommenter-laravel-php'
2121
target-branch: main
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Nodejs Knex Packages Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex
9+
pull_request:
10+
paths:
11+
- nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex
12+
jobs:
13+
unittests:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
17+
matrix:
18+
node-version: [ current, lts/* ]
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
- run: npm ci
27+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex
28+
- run: npm run build --if-present
29+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex
30+
- run: npm test
31+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex
32+
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Nodejs Sequelize Packages Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- nodejs/sqlcommenter-nodejs/packages/sqlcommenter-sequelize
9+
pull_request:
10+
paths:
11+
- nodejs/sqlcommenter-nodejs/packages/sqlcommenter-sequelize
12+
jobs:
13+
unittests:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
17+
matrix:
18+
node-version: [ current, lts/* ]
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
- run: npm ci
27+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-sequelize
28+
- run: npm run build --if-present
29+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-sequelize
30+
- run: npm test
31+
working-directory: ./nodejs/sqlcommenter-nodejs/packages/sqlcommenter-sequelize
32+

.github/workflows/python-tests.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Python Packages Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- python/sqlcommenter-python/**
9+
pull_request:
10+
paths:
11+
- python/sqlcommenter-python/**
12+
13+
jobs:
14+
unittests:
15+
env:
16+
# We use these variables to convert between tox and GHA version literals
17+
py36: 3.6
18+
py37: 3.7
19+
py38: 3.8
20+
py39: 3.9
21+
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
25+
matrix:
26+
python-version: [ py36, py37, py38, py39 ]
27+
os: [ ubuntu-20.04 ]
28+
steps:
29+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
30+
uses: actions/checkout@v2
31+
- name: Set up Python ${{ env[matrix.python-version] }}
32+
uses: actions/setup-python@v2
33+
with:
34+
python-version: ${{ env[matrix.python-version] }}
35+
- name: Install tox
36+
run: pip install -U tox-factor
37+
- name: run tox
38+
run: tox -e '${{ matrix.python-version }}-{django21,django22,django30,django31,django32,psycopg2,flask,generic,sqlalchemy}'
39+
working-directory: ./python/sqlcommenter-python
40+
41+
lint:
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
tox-environment: [ "lint" ]
46+
name: ${{ matrix.tox-environment }}
47+
runs-on: ubuntu-20.04
48+
steps:
49+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
50+
uses: actions/checkout@v2
51+
- name: Set up Python 3.9
52+
uses: actions/setup-python@v2
53+
with:
54+
python-version: 3.9
55+
- name: Install tox
56+
run: pip install -U tox
57+
- name: run tox
58+
run: tox -e flake8
59+
working-directory: ./python/sqlcommenter-python
60+

.github/workflows/unit-tests.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
name: Unit Tests
2+
23
on:
34
push:
45
branches:
56
- master
67
paths-ignore:
78
- php/sqlcommenter-php/packages/sqlcommenter-laravel/**
89
- php/sqlcommenter-php/samples/sqlcommenter-laravel/**
10+
- python/sqlcommenter-python/**
11+
- nodejs/**
912
pull_request:
1013
paths-ignore:
1114
- php/sqlcommenter-php/packages/sqlcommenter-laravel/**
1215
- php/sqlcommenter-php/samples/sqlcommenter-laravel/**
16+
- python/sqlcommenter-python/**
17+
- nodejs/**
18+
1319
jobs:
1420
unittests:
1521
runs-on: ubuntu-latest
1622
steps:
1723
- run: 'echo "No build required" '
24+
25+
lint:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- run: 'echo "No build required" '

0 commit comments

Comments
 (0)