From e11224126e94d1794eb409f937cd61458441829f Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Fri, 20 May 2022 17:32:13 +0300 Subject: [PATCH] Updated workflows (#8) updated workflows --- .github/workflows/github_pages.yml | 2 +- .github/workflows/publish_docker_images.yml | 46 +-------------------- README.md | 19 +++++---- 3 files changed, 15 insertions(+), 52 deletions(-) diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml index 17fb8880f11a..7c24937a4d74 100644 --- a/.github/workflows/github_pages.yml +++ b/.github/workflows/github_pages.yml @@ -7,7 +7,7 @@ on: jobs: deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml index 67cd1d9a724e..87b553c64fc8 100644 --- a/.github/workflows/publish_docker_images.yml +++ b/.github/workflows/publish_docker_images.yml @@ -1,53 +1,11 @@ name: Publish Docker images on: release: - types: [published] + types: [released] jobs: - Unit_testing: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run unit tests - env: - HOST_COVERAGE_DATA_DIR: ${{ github.workspace }} - CONTAINER_COVERAGE_DATA_DIR: '/coverage_data' - run: | - docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'coverage run -a manage.py test cvat/apps utils/cli' - docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-data && npm ci && cd ../cvat-core && npm ci && npm run test' - - E2E_testing: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '16.x' - - name: Run end-to-end tests - env: - DJANGO_SU_NAME: 'admin' - DJANGO_SU_EMAIL: 'admin@localhost.company' - DJANGO_SU_PASSWORD: '12qwaszx' - API_ABOUT_PAGE: "localhost:8080/api/server/about" - run: | - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build - docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml -f tests/docker-compose.file_share.yml up -d - /bin/bash -c 'while [[ $(curl -s -o /dev/null -w "%{http_code}" ${API_ABOUT_PAGE}) != "401" ]]; do sleep 5; done' - docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell" - cd ./tests - npm ci - npm run cypress:run:chrome - npm run cypress:run:chrome:canvas3d - - name: Uploading cypress screenshots as an artifact - if: failure() - uses: actions/upload-artifact@v2 - with: - name: cypress_screenshots - path: ${{ github.workspace }}/tests/cypress/screenshots - Push_to_registry: runs-on: ubuntu-latest - needs: [Unit_testing, E2E_testing] steps: - uses: actions/checkout@v2 - name: Build images @@ -60,7 +18,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Push to Docker Hub env: - DOCKERHUB_WORKSPACE: 'openvino' + DOCKERHUB_WORKSPACE: ${{ secrets.DOCKERHUB_WORKSPACE }} SERVER_IMAGE_REPO: 'cvat_server' UI_IMAGE_REPO: 'cvat_ui' run: | diff --git a/README.md b/README.md index 34791d46ca12..e9a740854c07 100644 --- a/README.md +++ b/README.md @@ -144,12 +144,12 @@ connection with your use of FFmpeg. ## Partners -- [ATLANTIS](https://github.com/smhassanerfani/atlantis) is an open-source dataset for semantic segmentation - of waterbody images, depevoped by [iWERS](http://ce.sc.edu/iwers/) group in the +- [ATLANTIS](https://github.com/smhassanerfani/atlantis) is an open-source dataset for semantic segmentation + of waterbody images, depevoped by [iWERS](http://ce.sc.edu/iwers/) group in the Department of Civil and Environmental Engineering at University of South Carolina, using CVAT. For developing a semantic segmentation dataset using CVAT, please check [ATLANTIS published article](https://www.sciencedirect.com/science/article/pii/S1364815222000391), - [ATLANTIS Development Kit](https://github.com/smhassanerfani/atlantis/tree/master/adk) + [ATLANTIS Development Kit](https://github.com/smhassanerfani/atlantis/tree/master/adk) and [annotation tutorial videos](https://www.youtube.com/playlist?list=PLIfLGY-zZChS5trt7Lc3MfNhab7OWl2BR). - [Onepanel](https://github.com/onepanelio/core) is an open source vision AI platform that fully integrates CVAT with scalable data processing @@ -193,13 +193,18 @@ Other ways to ask questions and get our support: [docker-server-pulls-img]: https://img.shields.io/docker/pulls/openvino/cvat_server.svg?style=flat-square&label=server%20pulls [docker-server-image-url]: https://hub.docker.com/r/openvino/cvat_server + [docker-ui-pulls-img]: https://img.shields.io/docker/pulls/openvino/cvat_ui.svg?style=flat-square&label=UI%20pulls [docker-ui-image-url]: https://hub.docker.com/r/openvino/cvat_ui -[ci-img]: https://github.com/openvinotoolkit/cvat/workflows/CI/badge.svg?branch=develop -[ci-url]: https://github.com/openvinotoolkit/cvat/actions + +[ci-img]: https://github.com/cvat-ai/cvat/workflows/CI/badge.svg?branch=develop +[ci-url]: https://github.com/cvat-ai/cvat/actions + [gitter-img]: https://badges.gitter.im/opencv-cvat/gitter.png [gitter-url]: https://gitter.im/opencv-cvat -[coverage-img]: https://coveralls.io/repos/github/openvinotoolkit/cvat/badge.svg?branch=develop -[coverage-url]: https://coveralls.io/github/openvinotoolkit/cvat?branch=develop + +[coverage-img]: https://coveralls.io/repos/github/cvat-ai/cvat/badge.svg?branch=develop +[coverage-url]: https://coveralls.io/github/cvat-ai/cvat?branch=develop + [doi-img]: https://zenodo.org/badge/139156354.svg [doi-url]: https://zenodo.org/badge/latestdoi/139156354