Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.21.3 #8621

Merged
merged 16 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
cache-from: type=local,src=/tmp/cvat_cache_server
context: .
file: Dockerfile
tags: cvat/server
tags: cvat/server:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_server/image.tar

- name: CVAT UI. Build and push
Expand All @@ -64,7 +64,7 @@ jobs:
cache-from: type=local,src=/tmp/cvat_cache_ui
context: .
file: Dockerfile.ui
tags: cvat/ui
tags: cvat/ui:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_ui/image.tar

- name: CVAT SDK. Build
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.9'

- name: Download CVAT server image
uses: actions/download-artifact@v4
Expand All @@ -126,8 +126,6 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Verify API schema
Expand Down Expand Up @@ -203,7 +201,6 @@ jobs:
- name: Load Docker server image
run: |
docker load --input /tmp/cvat_server/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker image ls -a

- name: Running OPA tests
Expand Down Expand Up @@ -280,8 +277,6 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Run CVAT instance
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
cache-from: type=local,src=/tmp/cvat_cache_server
context: .
file: Dockerfile
tags: cvat/server
tags: cvat/server:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_server/image.tar

- name: Instrumentation of the code then rebuilding the CVAT UI
Expand All @@ -81,7 +81,7 @@ jobs:
cache-from: type=local,src=/tmp/cvat_cache_ui
context: .
file: Dockerfile.ui
tags: cvat/ui
tags: cvat/ui:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_ui/image.tar

- name: CVAT SDK. Build
Expand All @@ -95,7 +95,7 @@ jobs:
id: verify_schema
run: |
docker load --input /tmp/cvat_server/image.tar
docker run --rm cvat/server bash \
docker run --rm "cvat/server:${CVAT_VERSION}" bash \
-c 'python manage.py spectacular' > cvat/schema-expected.yml

if ! git diff --no-index cvat/schema.yml cvat/schema-expected.yml; then
Expand All @@ -109,7 +109,7 @@ jobs:

- name: Verify migrations
run: |
docker run --rm cvat/server bash \
docker run --rm "cvat/server:${CVAT_VERSION}" bash \
-c 'python manage.py makemigrations --check'

- name: Upload CVAT server artifact
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.9'

- name: Download CVAT server image
uses: actions/download-artifact@v4
Expand All @@ -156,8 +156,6 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Generate SDK
Expand Down Expand Up @@ -221,7 +219,6 @@ jobs:
- name: Load Docker server image
run: |
docker load --input /tmp/cvat_server/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker image ls -a

- name: Running OPA tests
Expand Down Expand Up @@ -304,8 +301,6 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Run CVAT instance
Expand Down Expand Up @@ -426,10 +421,10 @@ jobs:
SERVER_IMAGE_REPO: ${{ secrets.DOCKERHUB_WORKSPACE }}/server
UI_IMAGE_REPO: ${{ secrets.DOCKERHUB_WORKSPACE }}/ui
run: |
docker tag cvat/server:latest "${SERVER_IMAGE_REPO}:dev"
docker tag "cvat/server:${CVAT_VERSION}" "${SERVER_IMAGE_REPO}:dev"
docker push "${SERVER_IMAGE_REPO}:dev"

docker tag cvat/ui:latest "${UI_IMAGE_REPO}:dev"
docker tag "cvat/ui:${CVAT_VERSION}" "${UI_IMAGE_REPO}:dev"
docker push "${UI_IMAGE_REPO}:dev"

codecov:
Expand Down
133 changes: 48 additions & 85 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ on:
workflow_dispatch:

env:
SERVER_IMAGE_TEST_REPO: cvat_server
UI_IMAGE_TEST_REPO: instrumentation_cvat_ui
CYPRESS_VERIFY_TIMEOUT: 180000 # https://docs.cypress.io/guides/guides/command-line#cypress-verify
CVAT_VERSION: "local"

jobs:
check_updates:
Expand Down Expand Up @@ -48,12 +47,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_CI_USERNAME }}
password: ${{ secrets.DOCKERHUB_CI_TOKEN }}

- name: CVAT server. Getting cache from the default branch
uses: actions/cache@v4
with:
Expand All @@ -66,44 +59,44 @@ jobs:
path: /tmp/cvat_cache_ui
key: ${{ runner.os }}-build-ui-${{ needs.search_cache.outputs.sha }}

- name: CVAT server. Extract metadata (tags, labels) for Docker
id: meta-server
uses: docker/metadata-action@master
with:
images: ${{ secrets.DOCKERHUB_CI_WORKSPACE }}/${{ env.SERVER_IMAGE_TEST_REPO }}
tags:
type=raw,value=nightly

- name: CVAT UI. Extract metadata (tags, labels) for Docker
id: meta-ui
uses: docker/metadata-action@master
with:
images: ${{ secrets.DOCKERHUB_CI_WORKSPACE }}/${{ env.UI_IMAGE_TEST_REPO }}
tags:
type=raw,value=nightly

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Create artifact directories
run: |
mkdir /tmp/cvat_server
mkdir /tmp/cvat_ui
mkdir /tmp/cvat_sdk

- name: CVAT server. Build and push
uses: docker/build-push-action@v6
with:
cache-from: type=local,src=/tmp/cvat_cache_server
context: .
file: Dockerfile
push: true
tags: ${{ steps.meta-server.outputs.tags }}
labels: ${{ steps.meta-server.outputs.labels }}
tags: cvat/server:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_server/image.tar

- name: CVAT UI. Build and push
uses: docker/build-push-action@v6
with:
cache-from: type=local,src=/tmp/cvat_cache_ui
context: .
file: Dockerfile.ui
push: true
tags: ${{ steps.meta-ui.outputs.tags }}
labels: ${{ steps.meta-ui.outputs.labels }}
tags: cvat/ui:${{ env.CVAT_VERSION }}
outputs: type=docker,dest=/tmp/cvat_ui/image.tar

- name: Upload CVAT server artifact
uses: actions/upload-artifact@v4
with:
name: cvat_server
path: /tmp/cvat_server/image.tar

- name: Upload CVAT UI artifact
uses: actions/upload-artifact@v4
with:
name: cvat_ui
path: /tmp/cvat_ui/image.tar

unit_testing:
needs: build
Expand All @@ -113,43 +106,25 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.9'

- name: Getting CVAT UI cache from the default branch
uses: actions/cache@v4
- name: Download CVAT server image
uses: actions/download-artifact@v4
with:
path: /tmp/cvat_cache_ui
key: ${{ runner.os }}-build-ui-${{ needs.search_cache.outputs.sha }}
name: cvat_server
path: /tmp/cvat_server/

- name: Building CVAT UI image
uses: docker/build-push-action@v6
- name: Download CVAT UI images
uses: actions/download-artifact@v4
with:
context: .
file: ./Dockerfile.ui
cache-from: type=local,src=/tmp/cvat_cache_ui
tags: cvat/ui:latest
load: true
name: cvat_ui
path: /tmp/cvat_ui/

- name: CVAT server. Extract metadata (tags, labels) for Docker
id: meta-server
uses: docker/metadata-action@master
with:
images: ${{ secrets.DOCKERHUB_CI_WORKSPACE }}/${{ env.SERVER_IMAGE_TEST_REPO }}
tags:
type=raw,value=nightly

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_CI_USERNAME }}
password: ${{ secrets.DOCKERHUB_CI_TOKEN }}

- name: Pull CVAT server image
- name: Load Docker images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:local
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:latest
docker tag cvat/ui:latest cvat/ui:local
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker image ls -a

- name: OPA tests
run: |
Expand Down Expand Up @@ -210,35 +185,23 @@ jobs:
with:
node-version: '16.x'

- name: Login to Docker Hub
uses: docker/login-action@v3
- name: Download CVAT server image
uses: actions/download-artifact@v4
with:
username: ${{ secrets.DOCKERHUB_CI_USERNAME }}
password: ${{ secrets.DOCKERHUB_CI_TOKEN }}
name: cvat_server
path: /tmp/cvat_server/

- name: CVAT server. Extract metadata (tags, labels) for Docker
id: meta-server
uses: docker/metadata-action@master
- name: Download CVAT UI image
uses: actions/download-artifact@v4
with:
images: ${{ secrets.DOCKERHUB_CI_WORKSPACE }}/${{ env.SERVER_IMAGE_TEST_REPO }}
tags:
type=raw,value=nightly
name: cvat_ui
path: /tmp/cvat_ui/

- name: CVAT UI. Extract metadata (tags, labels) for Docker
id: meta-ui
uses: docker/metadata-action@master
with:
images: ${{ secrets.DOCKERHUB_CI_USERNAME }}/${{ env.UI_IMAGE_TEST_REPO }}
tags:
type=raw,value=nightly

- name: Pull CVAT UI image
- name: Load Docker images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:dev

docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui:dev
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker image ls -a

- name: Run CVAT instance
run: |
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- scriv-insert-here -->

<a id='changelog-2.21.3'></a>
## \[2.21.3\] - 2024-10-31

### Changed

- CLI no longer prints the stack trace in case of HTTP errors
(<https://github.com/cvat-ai/cvat/pull/8601>)

### Removed

- Dropped support for Python 3.8 since its EOL was on 2024-10-07
(<https://github.com/cvat-ai/cvat/pull/8360>)

### Fixed

- Requests page crush with `Cannot read property 'target' of undefined` error
(<https://github.com/cvat-ai/cvat/pull/8575>)

- Tags in ground truth job were displayed as `tag (GT)`
(<https://github.com/cvat-ai/cvat/pull/8586>)

- Tags in ground truth job couldn't be deleted via `x` button
(<https://github.com/cvat-ai/cvat/pull/8586>)

- Exception 'Canvas is busy' when change frame during drag/resize a track
(<https://github.com/cvat-ai/cvat/pull/8598>)

- A shape gets shifted if auto save triggered during dragging
(<https://github.com/cvat-ai/cvat/pull/8598>)

<a id='changelog-2.21.2'></a>
## \[2.21.2\] - 2024-10-24

Expand Down
Loading
Loading