Skip to content

Commit

Permalink
Merge pull request #503 from exadel-inc/0.5.0
Browse files Browse the repository at this point in the history
0.5.0 to master
  • Loading branch information
pospielov authored Apr 25, 2021
2 parents 4b233d3 + fa7ac74 commit 8aa4654
Show file tree
Hide file tree
Showing 891 changed files with 13,993 additions and 93,495 deletions.
10 changes: 6 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
registry=exadel/
postgres_username=postgres
postgres_password=postgres
postgres_db=frs
postgres_domain=compreface-postgres-db
postgres_port=5432
email_host=smtp.gmail.com
Expand All @@ -10,7 +12,7 @@ enable_email_server=false
save_images_to_db=true
compreface_api_java_options=-Xmx8g
compreface_admin_java_options=-Xmx8g
ADMIN_VERSION=0.4.1
API_VERSION=0.4.1
FE_VERSION=0.4.1
CORE_VERSION=0.4.1
ADMIN_VERSION=0.5.0
API_VERSION=0.5.0
FE_VERSION=0.5.0
CORE_VERSION=0.5.0
17 changes: 8 additions & 9 deletions .github/workflows/Push-Python-to-Dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ on:
workflow_dispatch:
inputs:
version:
description: Version
default: v1.0.0
description: Version (e.g., 0.4.1)
required: true
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: docker login
- name: Build the Docker image and push
env:
VERSION: ${{ github.event.inputs.version }}
DOCKER_USER: ${{secrets.DOCKER_HUB_LOGIN}}
DOCKER_PASSWORD: ${{secrets.DOCKER_HUB_PWD}}
run: |
docker login -u "${DOCKER_HUB_LOGIN}" -p "${DOCKER_HUB_PWD}"
- name: Build the Docker image
DOCKER_REGISTRY: ${{secrets.DOCKER_HUB_LOGIN}}/
working-directory: ./embedding-calculator/
run: |
make build-images VERSION={{ github.event.inputs.version }}
- name: Docker Push
run: docker push exadel/compreface-core
make build-images
docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
docker push --all-tags ${DOCKER_REGISTRY}compreface-core
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
with:
path-to-signatures: 'signatures/cla.json'
path-to-cla-document: 'https://github.com/exadel-inc/CompreFace/blob/develop/CLA.md'
path-to-cla-document: 'https://github.com/exadel-inc/CompreFace/blob/master/CLA.md'
branch: 'CLA-signatures'
allowlist: bot*
36 changes: 36 additions & 0 deletions .github/workflows/unit-tests-on-nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Unit tests on Node.js

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.10]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
- name: Install dependencies
working-directory: ./ui
run: npm install
- name: Run tests
working-directory: ./ui
run: npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
35 changes: 35 additions & 0 deletions .github/workflows/unit-tests-on-python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Unit tests on Python test

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]
jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
working-directory: ./embedding-calculator/
run: |
sudo apt-get update && sudo apt-get install -y libjpeg-dev libpng-dev \
libtiff-dev libavformat-dev libpq-dev libfreeimage3
python -m pip install --upgrade pip
python -m pip --no-cache-dir install -r requirements.txt
python -m src.services.facescan.plugins.setup
- name: Test with pytest
working-directory: ./embedding-calculator/
run: |
pip install pytest
pip install pytest-cov
python -m pytest -m "not performance" ./src
Loading

0 comments on commit 8aa4654

Please sign in to comment.