Skip to content

Commit 8a205f0

Browse files
authored
Merge pull request #316 from ComputerScienceHouse/develop
2 parents 14ac00b + 97ccf1a commit 8a205f0

File tree

24 files changed

+180
-426
lines changed

24 files changed

+180
-426
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Dockerfile
2+
.gitignore

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "pip" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
13+
- package-ecosystem: "npm" # See documentation for possible values
14+
directory: "/" # Location of package manifests
15+
schedule:
16+
interval: "weekly"

.github/workflows/docker-build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Docker
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
9+
# Run tests for any PRs.
10+
pull_request:
11+
branches:
12+
- develop
13+
- master
14+
15+
env:
16+
IMAGE_NAME: conditional
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: Run tests
26+
run: |
27+
if [ -f docker-compose.test.yml ]; then
28+
docker-compose --file docker-compose.test.yml build
29+
docker-compose --file docker-compose.test.yml run sut
30+
else
31+
docker build . --file Dockerfile
32+
fi

.github/workflows/node-js.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Node.js CI
5+
6+
on:
7+
push:
8+
branches: [develop, master]
9+
pull_request:
10+
branches: [develop, master]
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
node-version: [8.x, 10.x]
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
- run: npm install
27+
- run: npm run production

.github/workflows/python-app.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This workflow will install Python dependencies, run tests and lint with a single version of Python
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3+
4+
name: Python application
5+
6+
on:
7+
push:
8+
branches: [master, develop]
9+
pull_request:
10+
branches: [master, develop]
11+
12+
jobs:
13+
lint:
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
python-version: [3.8, 3.9]
19+
20+
steps:
21+
- name: Install ldap dependencies
22+
run: sudo apt-get install libldap2-dev libsasl2-dev
23+
- uses: actions/checkout@v2
24+
- name: Set up Python ${{ matrix.python-version }}
25+
uses: actions/setup-python@v2
26+
with:
27+
python-version: ${{ matrix.python-version }}
28+
- name: Install dependencies
29+
run: |
30+
python -m pip install --upgrade pip
31+
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
32+
- name: Lint with pylint
33+
run: |
34+
pylint conditional

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ __pycache__/
99
# Distribution / packaging
1010
.Python
1111
env/
12+
venv/
1213
build/
1314
develop-eggs/
1415
dist/

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.1
1+
10

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ min-public-methods = 2
9090
max-public-methods = 20
9191

9292
[EXCEPTIONS]
93-
overgeneral-exceptions = Exception
93+
overgeneral-exceptions = Exception

.travis.yml

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

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-stretch
1+
FROM docker.io/python:3.8-buster
22
MAINTAINER Devin Matte <matted@csh.rit.edu>
33

44
RUN mkdir /opt/conditional
@@ -8,15 +8,15 @@ ADD requirements.txt /opt/conditional
88
WORKDIR /opt/conditional
99

1010
RUN apt-get -yq update && \
11-
apt-get -yq install libsasl2-dev libldap2-dev libssl-dev && \
11+
apt-get -yq install libsasl2-dev libldap2-dev libssl-dev gcc g++ make && \
1212
pip install -r requirements.txt && \
1313
apt-get -yq clean all
1414

1515
ADD . /opt/conditional
1616

17-
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
17+
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
1818
apt-get -yq update && \
19-
apt-get -yq install nodejs npm && \
19+
apt-get -yq install nodejs && \
2020
npm install && \
2121
npm run production && \
2222
rm -rf node_modules && \

0 commit comments

Comments
 (0)