From 15031882fb949e6f686de8742e11656b3653bc91 Mon Sep 17 00:00:00 2001
From: plyfager <2744335995@qq.com>
Date: Thu, 1 Sep 2022 10:48:04 +0800
Subject: [PATCH 1/2] restart publish

---
 .github/workflows/deploy.yml | 40 ++++++++++++++++++------------------
 docker/Dockerfile            |  5 +++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2d9632dbc..5ec5a0f22 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,23 +6,23 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-# jobs:
-#   build-n-publish:
-#     runs-on: ubuntu-latest
-#     if: startsWith(github.event.ref, 'refs/tags')
-#     steps:
-#       - uses: actions/checkout@v2
-#       - name: Set up Python 3.7
-#         uses: actions/setup-python@v2
-#         with:
-#           python-version: 3.7
-#       - name: Install torch
-#         run: pip install torch
-#       - name: Install wheel
-#         run: pip install wheel
-#       - name: Build MMGeneration
-#         run: python setup.py sdist bdist_wheel
-#       - name: Publish distribution to PyPI
-#         run: |
-#           pip install twine
-#           twine upload dist/* -u __token__ -p ${{ secrets.pypi_password }}
+jobs:
+  build-n-publish:
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.ref, 'refs/tags')
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install torch
+        run: pip install torch
+      - name: Install wheel
+        run: pip install wheel
+      - name: Build MMGeneration
+        run: python setup.py sdist bdist_wheel
+      - name: Publish distribution to PyPI
+        run: |
+          pip install twine
+          twine upload dist/* -u __token__ -p ${{ secrets.pypi_password }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a5e3d8e66..6a60e140d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,11 +13,12 @@ RUN apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build
     && rm -rf /var/lib/apt/lists/*
 
 # Install MMCV
-RUN pip install mmcv-full==1.3.16 -f https://download.openmmlab.com/mmcv/dist/cu111/torch1.8.0/index.html
+RUN pip install openmim
+RUN mim install mmcv>=2.0.0rc1
 
 # Install MMGeneration
 RUN conda clean --all
-RUN git clone https://github.com/open-mmlab/mmgeneration.git /mmgen
+RUN git clone -b 1.x https://github.com/open-mmlab/mmgeneration.git /mmgen
 WORKDIR /mmgen
 ENV FORCE_CUDA="1"
 RUN pip install -r requirements.txt

From e1a583e34e389de5f7dd70573df016898c875f0d Mon Sep 17 00:00:00 2001
From: plyfager <2744335995@qq.com>
Date: Thu, 1 Sep 2022 10:53:41 +0800
Subject: [PATCH 2/2] fix mmcv version

---
 mmgen/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmgen/__init__.py b/mmgen/__init__.py
index ed7d60517..ac343179b 100644
--- a/mmgen/__init__.py
+++ b/mmgen/__init__.py
@@ -16,7 +16,7 @@ def digit_version(version_str):
     return digit_version
 
 
-mmcv_minimum_version = '2.0.0rc0'
+mmcv_minimum_version = '2.0.0rc1'
 mmcv_maximum_version = '2.0.0'
 mmcv_version = digit_version(mmcv.__version__)