forked from cvat-ai/cvat
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'cvat-ai:develop' into develop
- Loading branch information
Showing
199 changed files
with
5,612 additions
and
3,635 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,19 +29,19 @@ jobs: | |
| ref: ${{ inputs.ref }} | ||
|
|
||
| - name: CVAT server. Getting cache from the default branch | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: /tmp/cvat_cache_server | ||
| key: ${{ runner.os }}-build-server-${{ needs.search_cache.outputs.sha }} | ||
|
|
||
| - name: CVAT UI. Getting cache from the default branch | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: /tmp/cvat_cache_ui | ||
| key: ${{ runner.os }}-build-ui-${{ needs.search_cache.outputs.sha }} | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v2 | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Create artifact directories | ||
| run: | | ||
|
|
@@ -50,7 +50,7 @@ jobs: | |
| mkdir /tmp/cvat_sdk | ||
| - name: CVAT server. Build and push | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| cache-from: type=local,src=/tmp/cvat_cache_server | ||
| context: . | ||
|
|
@@ -59,7 +59,7 @@ jobs: | |
| outputs: type=docker,dest=/tmp/cvat_server/image.tar | ||
|
|
||
| - name: CVAT UI. Build and push | ||
| uses: docker/build-push-action@v3 | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| cache-from: type=local,src=/tmp/cvat_cache_ui | ||
| context: . | ||
|
|
@@ -75,19 +75,19 @@ jobs: | |
| cp -r cvat-sdk/* /tmp/cvat_sdk/ | ||
| - name: Upload CVAT server artifact | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cvat_server | ||
| path: /tmp/cvat_server/image.tar | ||
|
|
||
| - name: Upload CVAT UI artifact | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cvat_ui | ||
| path: /tmp/cvat_ui/image.tar | ||
|
|
||
| - name: Upload CVAT SDK artifact | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cvat_sdk | ||
| path: /tmp/cvat_sdk/ | ||
|
|
@@ -100,24 +100,24 @@ jobs: | |
| with: | ||
| ref: ${{ inputs.ref }} | ||
|
|
||
| - uses: actions/setup-python@v4 | ||
| - uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.8' | ||
|
|
||
| - name: Download CVAT server image | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_server | ||
| path: /tmp/cvat_server/ | ||
|
|
||
| - name: Download CVAT UI images | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_ui | ||
| path: /tmp/cvat_ui/ | ||
|
|
||
| - name: Download CVAT SDK package | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_sdk | ||
| path: /tmp/cvat_sdk/ | ||
|
|
@@ -150,13 +150,6 @@ jobs: | |
| docker run --rm cvat/server:${CVAT_VERSION} bash \ | ||
| -c 'python manage.py makemigrations --check' | ||
| - name: Upload expected schema as an artifact | ||
| if: failure() && steps.verify_schema.conclusion == 'failure' | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: expected_schema | ||
| path: cvat/schema-expected.yml | ||
|
|
||
| - name: Generate SDK | ||
| run: | | ||
| pip3 install -r cvat-sdk/gen/requirements.txt | ||
|
|
@@ -186,7 +179,7 @@ jobs: | |
| - name: Uploading "cvat" container logs as an artifact | ||
| if: failure() && steps.run_tests.conclusion == 'failure' | ||
| uses: actions/upload-artifact@v3.1.2 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: rest_api_container_logs | ||
| path: "${{ github.workspace }}/rest_api_testing" | ||
|
|
@@ -200,7 +193,7 @@ jobs: | |
| ref: ${{ inputs.ref }} | ||
|
|
||
| - name: Download CVAT server image | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_server | ||
| path: /tmp/cvat_server/ | ||
|
|
@@ -245,7 +238,7 @@ jobs: | |
| - name: Uploading "cvat" container logs as an artifact | ||
| if: failure() | ||
| uses: actions/upload-artifact@v3.1.1 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: unit_tests_container_logs | ||
| path: "${{ github.workspace }}/unit_testing" | ||
|
|
@@ -270,13 +263,13 @@ jobs: | |
| node-version: '16.x' | ||
|
|
||
| - name: Download CVAT server image | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_server | ||
| path: /tmp/cvat_server/ | ||
|
|
||
| - name: Download CVAT UI image | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cvat_ui | ||
| path: /tmp/cvat_ui/ | ||
|
|
@@ -345,14 +338,14 @@ jobs: | |
| - name: Uploading "cvat" container logs as an artifact | ||
| if: failure() | ||
| uses: actions/upload-artifact@v3.1.1 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: e2e_container_logs | ||
| name: e2e_container_logs_${{ matrix.specs }} | ||
| path: ${{ github.workspace }}/tests/cvat_${{ matrix.specs }}.log | ||
|
|
||
| - name: Uploading cypress screenshots as an artifact | ||
| if: failure() | ||
| uses: actions/upload-artifact@v3.1.1 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cypress_screenshots_${{ matrix.specs }} | ||
| path: ${{ github.workspace }}/tests/cypress/screenshots | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.