diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a647b142..1e59492d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,7 @@ on: env: CYPRESS_VERIFY_TIMEOUT: 180000 # https://docs.cypress.io/guides/guides/command-line#cypress-verify + CVAT_VERSION: "local" jobs: search_cache: @@ -158,8 +159,8 @@ 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:dev - docker tag cvat/ui:latest cvat/ui:dev + docker tag cvat/server:latest cvat/server:${CVAT_VERSION} + docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION} docker image ls -a - name: Running REST API and SDK tests @@ -204,7 +205,7 @@ jobs: - name: Load Docker server image run: | docker load --input /tmp/cvat_server/image.tar - docker tag cvat/server:latest cvat/server:dev + docker tag cvat/server:latest cvat/server:${CVAT_VERSION} docker image ls -a - name: Running OPA tests @@ -285,8 +286,8 @@ 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:dev - docker tag cvat/ui:latest cvat/ui:dev + 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index c09777c7..d2fa0b2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## \[2.3.0] - Unreleased +## \[2.4.0] - Unreleased +### Added +- TDB + +### Changed +- TDB + +### Deprecated +- TDB + +### Removed +- TDB + +### Fixed +- TDB + +### Security +- TDB + +## \[2.3.0] - 2022-12-22 ### Added - SDK section in docs () - An option to enable or disable host certificate checking in CLI () @@ -37,9 +56,6 @@ from online detectors & interactors) ( - In the SDK, functions taking paths as strings now also accept path-like objects () -### Deprecated -- TDB - ### Removed - The `--https` option of CLI () @@ -107,9 +123,6 @@ non-ascii paths while adding files from "Connected file share" (issue #4428) - `Project.import_dataset` not waiting for completion correctly () -### Security -- TDB - ## \[2.2.0] - 2022-09-12 ### Added - Added ability to delete frames from a job based on () diff --git a/cvat/__init__.py b/cvat/__init__.py index 146227fe..527f4186 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 3, 0, 'alpha', 0) +VERSION = (2, 4, 0, 'alpha', 0) __version__ = get_version(VERSION)