Merge remote-tracking branch 'upstream/develop' into develop_new_repo

summeroff · Apr 7, 2024 · a454685 · a454685
2 parents 543cc13 + 70a7cc0
commit a454685
Show file tree

Hide file tree

Showing 236 changed files with 6,657 additions and 2,126 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -8,7 +8,7 @@ body:
     options:
     - label: I searched the existing issues and did not find anything similar.
       required: true
-    - label: I read/searched [the docs](https://opencv.github.io/cvat/docs/)
+    - label: I read/searched [the docs](https://docs.cvat.ai/docs/)
       required: true
 
 - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -8,7 +8,7 @@ body:
     options:
     - label: I searched the existing issues and did not find anything similar.
       required: true
-    - label: I read/searched [the docs](https://opencv.github.io/cvat/docs/)
+    - label: I read/searched [the docs](https://docs.cvat.ai/docs/)
       required: true
 - type: textarea
   attributes:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
-<!-- Raise an issue to propose your change (https://github.com/opencv/cvat/issues).
+<!-- Raise an issue to propose your change (https://github.com/cvat-ai/cvat/issues).
 It helps to avoid duplication of efforts from multiple independent contributors.
 Discuss your ideas with maintainers to be sure that changes will be approved and merged.
-Read the [Contribution guide](https://opencv.github.io/cvat/docs/contributing/). -->
+Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/). -->
 
 <!-- Provide a general summary of your changes in the Title above -->
 
@@ -27,13 +27,13 @@ If you're unsure about any of these, don't hesitate to ask. We're here to help!
 - [ ] I have linked related issues (see [GitHub docs](
   https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
 - [ ] I have increased versions of npm packages if it is necessary
-  ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),
-  [cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),
-  [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and
-  [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))
+  ([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
+  [cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
+  [cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning) and
+  [cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
 
 ### License
 
 - [ ] I submit _my code changes_ under the same [MIT License](
-  https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project.
+  https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the project.
   Feel free to contact the maintainers if that's a concern.
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       REPO: ${{ github.repository }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,67 @@
+name: Docs
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+  pull_request:
+    types: [ready_for_review, opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate_github_pages:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Generate CVAT SDK
+        run: |
+          pip3 install --user -r cvat-sdk/gen/requirements.txt
+          ./cvat-sdk/gen/generate.sh
+
+      - name: Setup Hugo
+        run: |
+          wget https://github.com/gohugoio/hugo/releases/download/v0.110.0/hugo_extended_0.110.0_Linux-64bit.tar.gz
+          (mkdir hugo_extended_0.110.0_Linux-64bit && tar -xf hugo_extended_0.110.0_Linux-64bit.tar.gz -C hugo_extended_0.110.0_Linux-64bit)
+
+          wget https://github.com/gohugoio/hugo/releases/download/v0.83.0/hugo_extended_0.83.0_Linux-64bit.tar.gz
+          (mkdir hugo_extended_0.83.0_Linux-64bit && tar -xf hugo_extended_0.83.0_Linux-64bit.tar.gz -C hugo_extended_0.83.0_Linux-64bit)
+
+          mkdir hugo
+          cp hugo_extended_0.110.0_Linux-64bit/hugo hugo/hugo-0.110
+          cp hugo_extended_0.83.0_Linux-64bit/hugo hugo/hugo-0.83
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+
+      - name: Install npm packages
+        working-directory: ./site
+        run: |
+          npm ci
+
+      - name: Build docs
+        run: |
+          pip install -r site/requirements.txt
+          python site/process_sdk_docs.py
+          PATH="$PWD/hugo:$PATH" python site/build_docs.py
+        env:
+          HUGO_ENV: production
+
+      - name: Deploy
+        if: github.ref == 'refs/heads/develop'
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public
+          force_orphan: true
+          cname: docs.cvat.ai
diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml
@@ -22,7 +22,7 @@ jobs:
 
   build:
     needs: search_cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
         with:
@@ -94,7 +94,7 @@ jobs:
 
   rest_api_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
         with:
@@ -187,7 +187,7 @@ jobs:
 
   unit_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
         with:
@@ -247,7 +247,7 @@ jobs:
 
   e2e_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -21,7 +21,7 @@ jobs:
       github.event.pull_request.draft == false &&
       !startsWith(github.event.pull_request.title, '[WIP]') &&
       !startsWith(github.event.pull_request.title, '[Dependent]')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
     - uses: actions/checkout@v4
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
 
   build:
     needs: search_cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -127,7 +127,7 @@ jobs:
 
   rest_api_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -208,7 +208,7 @@ jobs:
 
   unit_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -274,7 +274,7 @@ jobs:
 
   e2e_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     strategy:
       fail-fast: false
       matrix:
@@ -385,63 +385,10 @@ jobs:
           name: cypress_screenshots_${{ matrix.specs }}
           path: ${{ github.workspace }}/tests/cypress/screenshots
 
-  generate_github_pages:
-    needs: [rest_api_testing, unit_testing, e2e_testing]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Download CVAT SDK
-        uses: actions/download-artifact@v3
-        with:
-          name: cvat_sdk
-          path: /tmp/cvat_sdk/
-
-      - name: Setup Hugo
-        run: |
-          wget https://github.com/gohugoio/hugo/releases/download/v0.110.0/hugo_extended_0.110.0_Linux-64bit.tar.gz
-          (mkdir hugo_extended_0.110.0_Linux-64bit && tar -xf hugo_extended_0.110.0_Linux-64bit.tar.gz -C hugo_extended_0.110.0_Linux-64bit)
-
-          wget https://github.com/gohugoio/hugo/releases/download/v0.83.0/hugo_extended_0.83.0_Linux-64bit.tar.gz
-          (mkdir hugo_extended_0.83.0_Linux-64bit && tar -xf hugo_extended_0.83.0_Linux-64bit.tar.gz -C hugo_extended_0.83.0_Linux-64bit)
-
-          mkdir hugo
-          cp hugo_extended_0.110.0_Linux-64bit/hugo hugo/hugo-0.110
-          cp hugo_extended_0.83.0_Linux-64bit/hugo hugo/hugo-0.83
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-
-      - name: Install npm packages
-        working-directory: ./site
-        run: |
-          npm ci
-
-      - name: Build docs
-        run: |
-          pip install -r site/requirements.txt
-          python site/process_sdk_docs.py --input-dir /tmp/cvat_sdk/docs/ --site-root site/
-          PATH="$PWD/hugo:$PATH" python site/build_docs.py
-        env:
-          HUGO_ENV: production
-
-      - name: Deploy
-        if: github.ref == 'refs/heads/develop'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./public
-          force_orphan: true
-
   publish_dev_images:
     if: github.ref == 'refs/heads/develop'
-    needs: [rest_api_testing, unit_testing, e2e_testing, generate_github_pages]
-    runs-on: ubuntu-latest
+    needs: [rest_api_testing, unit_testing, e2e_testing]
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -480,7 +427,7 @@ jobs:
           docker push "${UI_IMAGE_REPO}:dev"
 
   codecov:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     needs: [unit_testing, e2e_testing, rest_api_testing]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   check_updates:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     env:
       REPO: ${{ github.repository }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -44,7 +44,7 @@ jobs:
 
   build:
     needs: search_cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -107,7 +107,7 @@ jobs:
 
   unit_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     steps:
       - uses: actions/checkout@v4
 
@@ -188,7 +188,7 @@ jobs:
 
   e2e_testing:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-big
     strategy:
       fail-fast: false
       matrix: