From 8f643de8dfd7b5ec2e54cd025d09f5f819700ad6 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:11:42 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=89=93=E5=8C=85windows=E4=B8=8B=E7=9A=84=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/conda-pack-windows.yml | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/conda-pack-windows.yml diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml new file mode 100644 index 00000000..419b495c --- /dev/null +++ b/.github/workflows/conda-pack-windows.yml @@ -0,0 +1,59 @@ +name: Create Conda Environment Package + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Setup Miniconda + uses: conda-incubator/setup-miniconda@v2 + with: + auto-activate-base: true + activate-environment: "" + + - name: Create new Conda environment + shell: bash -l {0} + run: | + conda create -n gpt python=3.11 -y + conda activate gpt + + - name: Copy files (excluding .git) + shell: bash -l {0} + run: | + mkdir temp_workspace + cp -r * temp_workspace/ 2>/dev/null || : + rm -rf temp_workspace/.git* || : + + - name: Install requirements + shell: bash -l {0} + run: | + conda activate gpt + pip install -r requirements.txt + + - name: Install conda-pack + shell: bash -l {0} + run: | + conda activate gpt + conda install conda-pack -y + + - name: Pack workspace and environment + shell: bash -l {0} + run: | + conda activate gpt + conda pack -n gpt -o gpt.tar.gz + cd temp_workspace + tar -czf ../workspace.tar.gz * + + - name: Upload packed files + uses: actions/upload-artifact@v2 + with: + name: gpt-academic-package + path: | + gpt.tar.gz + workspace.tar.gz From cd8212f5cdca677f3be56ff80959bd939938f481 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:11:54 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Windows_Run.bat | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Windows_Run.bat diff --git a/Windows_Run.bat b/Windows_Run.bat new file mode 100644 index 00000000..6da541ac --- /dev/null +++ b/Windows_Run.bat @@ -0,0 +1,26 @@ +@echo off +setlocal + +:: 设置环境变量 +set ENV_NAME=gpt +set ENV_PATH=%~dp0%ENV_NAME% +set SCRIPT_PATH=%~dp0main.py + +:: 判断环境是否已解压 +if not exist "%ENV_PATH%" ( + echo Extracting environment... + mkdir "%ENV_PATH%" + tar -xzf gpt.tar.gz -C "%ENV_PATH%" + + :: 运行conda环境激活脚本 + call "%ENV_PATH%\Scripts\activate.bat" +) else ( + :: 如果环境已存在,直接激活 + call "%ENV_PATH%\Scripts\activate.bat" +) +echo Start to run program: +:: 运行Python脚本 +python "%SCRIPT_PATH%" + +endlocal +pause \ No newline at end of file From 001765afc16f92e6b1f990af246417188f1381b3 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:12:53 +0800 Subject: [PATCH 03/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 419b495c..5817ec38 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -45,10 +45,10 @@ jobs: - name: Pack workspace and environment shell: bash -l {0} run: | - conda activate gpt - conda pack -n gpt -o gpt.tar.gz - cd temp_workspace - tar -czf ../workspace.tar.gz * + conda activate gpt + conda pack -n gpt -o gpt.tar.gz + cd temp_workspace + tar -czf ../workspace.tar.gz * - name: Upload packed files uses: actions/upload-artifact@v2 From 1051070892003b545e59f3b440f6a9a16c3f449f Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:17:00 +0800 Subject: [PATCH 04/12] Bug fix --- .github/workflows/conda-pack-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 5817ec38..01c61f1e 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -53,7 +53,7 @@ jobs: - name: Upload packed files uses: actions/upload-artifact@v2 with: - name: gpt-academic-package - path: | - gpt.tar.gz - workspace.tar.gz + name: gpt-academic-package + path: | + gpt.tar.gz + workspace.tar.gz From 7f4abaae80b55eb224ba31e845de3968763ad3d1 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:18:34 +0800 Subject: [PATCH 05/12] Bug fix --- .github/workflows/conda-pack-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 01c61f1e..7f1912d5 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -9,10 +9,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-activate-base: true activate-environment: "" @@ -51,7 +51,7 @@ jobs: tar -czf ../workspace.tar.gz * - name: Upload packed files - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: gpt-academic-package path: | From 37741d359920a750f4e4ac5a37c7a92809519c23 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 22:39:22 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/conda-pack-windows.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 7f1912d5..c23c6658 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -42,18 +42,21 @@ jobs: conda activate gpt conda install conda-pack -y - - name: Pack workspace and environment + - name: Activate conda environment and pack conda shell: bash -l {0} run: | conda activate gpt - conda pack -n gpt -o gpt.tar.gz - cd temp_workspace - tar -czf ../workspace.tar.gz * + mkdir -p temp_workspace + conda pack -n gpt -o temp_workspace/gpt.tar.gz + - name: Pack workspace + shell: bash -l {0} + run: | + cd temp_workspace + tar -czf workspace_with_env.tar.gz * + - name: Upload packed files uses: actions/upload-artifact@v4 with: name: gpt-academic-package - path: | - gpt.tar.gz - workspace.tar.gz + path: temp_workspace/workspace_with_env.tar.gz From 244e0dc9577c70f590fa467a9ba71648454934da Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 23:22:45 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/conda-pack-windows.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index c23c6658..ea816d5e 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -23,13 +23,6 @@ jobs: conda create -n gpt python=3.11 -y conda activate gpt - - name: Copy files (excluding .git) - shell: bash -l {0} - run: | - mkdir temp_workspace - cp -r * temp_workspace/ 2>/dev/null || : - rm -rf temp_workspace/.git* || : - - name: Install requirements shell: bash -l {0} run: | @@ -42,21 +35,23 @@ jobs: conda activate gpt conda install conda-pack -y - - name: Activate conda environment and pack conda + - name: Pack conda environment shell: bash -l {0} run: | conda activate gpt - mkdir -p temp_workspace - conda pack -n gpt -o temp_workspace/gpt.tar.gz + conda pack -n gpt -o gpt.tar.gz - - name: Pack workspace + - name: Create workspace zip shell: bash -l {0} run: | - cd temp_workspace - tar -czf workspace_with_env.tar.gz * + mkdir workspace + cp -r * workspace/ 2>/dev/null || : + rm -rf workspace/.git* + mv gpt.tar.gz workspace/ + zip -r workspace_with_env.zip workspace/* - name: Upload packed files uses: actions/upload-artifact@v4 with: name: gpt-academic-package - path: temp_workspace/workspace_with_env.tar.gz + path: workspace_with_env.zip From de28c44ff8a6b92d6347d064976a6e77ecda98b2 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 23:36:12 +0800 Subject: [PATCH 08/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index ea816d5e..951abcd4 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -48,7 +48,7 @@ jobs: cp -r * workspace/ 2>/dev/null || : rm -rf workspace/.git* mv gpt.tar.gz workspace/ - zip -r workspace_with_env.zip workspace/* + Compress-Archive -Path "workspace\*" -DestinationPath "workspace_with_env.zip" - name: Upload packed files uses: actions/upload-artifact@v4 From bbf1a577f9cf18a84e50db3361672c0cd7445497 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 23:44:17 +0800 Subject: [PATCH 09/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 951abcd4..9e835b5a 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -42,10 +42,10 @@ jobs: conda pack -n gpt -o gpt.tar.gz - name: Create workspace zip - shell: bash -l {0} + shell: pwsh run: | mkdir workspace - cp -r * workspace/ 2>/dev/null || : + cp -r * workspace/ 2>$null rm -rf workspace/.git* mv gpt.tar.gz workspace/ Compress-Archive -Path "workspace\*" -DestinationPath "workspace_with_env.zip" From dcbfde13562e70ee1fd77508abf6ae1400069473 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 23:52:30 +0800 Subject: [PATCH 10/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 9e835b5a..4990ef34 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -27,7 +27,8 @@ jobs: shell: bash -l {0} run: | conda activate gpt - pip install -r requirements.txt + pip install uv + uv pip install -r requirements.txt - name: Install conda-pack shell: bash -l {0} @@ -45,9 +46,9 @@ jobs: shell: pwsh run: | mkdir workspace - cp -r * workspace/ 2>$null - rm -rf workspace/.git* - mv gpt.tar.gz workspace/ + Get-ChildItem -Exclude "workspace" | Copy-Item -Destination workspace -Recurse + Remove-Item -Path workspace/.git* -Recurse -Force -ErrorAction SilentlyContinue + Move-Item gpt.tar.gz workspace/ Compress-Archive -Path "workspace\*" -DestinationPath "workspace_with_env.zip" - name: Upload packed files From 3142730ec480a2d22cad7cab8bdfc49ae2a19523 Mon Sep 17 00:00:00 2001 From: Menghuan Date: Thu, 5 Dec 2024 23:58:12 +0800 Subject: [PATCH 11/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 4990ef34..9eea16e1 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -48,7 +48,7 @@ jobs: mkdir workspace Get-ChildItem -Exclude "workspace" | Copy-Item -Destination workspace -Recurse Remove-Item -Path workspace/.git* -Recurse -Force -ErrorAction SilentlyContinue - Move-Item gpt.tar.gz workspace/ + Copy-Item gpt.tar.gz workspace/ -Force Compress-Archive -Path "workspace\*" -DestinationPath "workspace_with_env.zip" - name: Upload packed files From b30c1fd357372c825ece9b4307b6e9597e95ad5e Mon Sep 17 00:00:00 2001 From: Menghuan Date: Fri, 6 Dec 2024 00:03:52 +0800 Subject: [PATCH 12/12] Update conda-pack-windows.yml --- .github/workflows/conda-pack-windows.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-pack-windows.yml b/.github/workflows/conda-pack-windows.yml index 9eea16e1..5d5e2251 100644 --- a/.github/workflows/conda-pack-windows.yml +++ b/.github/workflows/conda-pack-windows.yml @@ -27,8 +27,7 @@ jobs: shell: bash -l {0} run: | conda activate gpt - pip install uv - uv pip install -r requirements.txt + pip install -r requirements.txt - name: Install conda-pack shell: bash -l {0} @@ -49,10 +48,9 @@ jobs: Get-ChildItem -Exclude "workspace" | Copy-Item -Destination workspace -Recurse Remove-Item -Path workspace/.git* -Recurse -Force -ErrorAction SilentlyContinue Copy-Item gpt.tar.gz workspace/ -Force - Compress-Archive -Path "workspace\*" -DestinationPath "workspace_with_env.zip" - name: Upload packed files uses: actions/upload-artifact@v4 with: name: gpt-academic-package - path: workspace_with_env.zip + path: workspace