From 987ab14ef0652d85be3961c46f9487807e17fe3a Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Wed, 3 May 2023 23:34:14 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E6=88=90=E5=8A=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=86=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BD=86=E4=BB=8D=E7=84=B6=E6=8F=90=E7=A4=BA=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mys_goods_tool/user_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mys_goods_tool/user_data.py b/mys_goods_tool/user_data.py index f1fbb44d..e32c7010 100644 --- a/mys_goods_tool/user_data.py +++ b/mys_goods_tool/user_data.py @@ -473,7 +473,7 @@ def load_config(): """ 加载用户数据文件 """ - if os.path.isfile(CONFIG_PATH): + if os.path.exists(CONFIG_PATH) and os.path.isfile(CONFIG_PATH): try: return UserData.parse_file(CONFIG_PATH) except (ValidationError, JSONDecodeError): From 8d11ce13d88dc3ed1dc9ce73c2e7e81b108a70cb Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 00:25:28 +0800 Subject: [PATCH 02/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E6=88=90=E5=8A=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=86=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E4=BD=86=E4=BB=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=E5=86=99?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mys_goods_tool/user_data.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mys_goods_tool/user_data.py b/mys_goods_tool/user_data.py index e32c7010..0b9be2fa 100644 --- a/mys_goods_tool/user_data.py +++ b/mys_goods_tool/user_data.py @@ -306,8 +306,11 @@ class Preference(BaseSettings): @validator("log_path") def _(cls, v: Optional[Path]): absolute_path = v.absolute() - if not os.access(absolute_path, os.W_OK): - logger.warning(f"程序没有写入日志文件 {absolute_path} 的权限") + if os.path.exists(absolute_path) and os.path.isfile(absolute_path): + if not os.access(absolute_path, os.W_OK): + logger.warning(f"程序没有写入日志文件 {absolute_path} 的权限") + elif not os.access(absolute_path.parent, os.W_OK): + logger.warning(f"程序没有写入日志目录 {absolute_path.parent} 的权限") return v class Config: From ad25c9cc4094398e6810c36d61adf4b9be55ff50 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:29:49 +0800 Subject: [PATCH 03/46] =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v1.yml | 2 +- .github/workflows/build-v2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v1.yml b/.github/workflows/build-v1.yml index 64dad2ae..6c1ef1d2 100644 --- a/.github/workflows/build-v1.yml +++ b/.github/workflows/build-v1.yml @@ -1,4 +1,4 @@ -name: Build and pack (v1) +name: Build (v1) on: workflow_dispatch: diff --git a/.github/workflows/build-v2.yml b/.github/workflows/build-v2.yml index f05d5180..134581bf 100644 --- a/.github/workflows/build-v2.yml +++ b/.github/workflows/build-v2.yml @@ -1,4 +1,4 @@ -name: Build and pack (v2) +name: Build (v2) on: workflow_dispatch: From d5e4305dae049d20c70c91a047c7a32a1dce7e67 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:30:31 +0800 Subject: [PATCH 04/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8QEMU=E8=BF=90=E8=A1=8Ci?= =?UTF-8?q?386=20Alpine=E8=BF=9B=E8=A1=8C=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/build-v2-i386_alpine.yml diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml new file mode 100644 index 00000000..890e41cc --- /dev/null +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -0,0 +1,66 @@ +name: Build (i386 Alpine, v2) + +on: + workflow_dispatch: + push: + path: + - 'mys_goods_tool/**' + - '.github/workflows/build-v2.yml' + - '__init__.py' + - 'Mys_Goods_Tool.spec' + - 'pyproject.toml' + + pull_request: + path: + - 'mys_goods_tool/**' + - '.github/workflows/build-v2.yml' + - '__init__.py' + - 'Mys_Goods_Tool.spec' + - 'pyproject.toml' + +permissions: + contents: read + +env: + # Initialize vars context by reading it from env context + _: ${{ vars._ }} + windows-poetry-path: C:\Users\runneradmin\AppData\Roaming\Python\Scripts\poetry + spec-file-path: Mys_Goods_Tool.spec + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + image: 'i386/alpine:latest' + platforms: 'i386' + + - name: Install Anaconda Distribution + run: | + curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh + bash ./miniconda.sh -b -p $HOME/miniconda + eval "$($HOME/bin/conda shell.bash hook)" + conda init + + - name: Install dependencies + run : | + conda create -n build python=3.11 + conda activate build + curl -sSL https://install.python-poetry.org | python3 - + poetry install --with pyinstaller + + - name: Build + run: | + poetry run pyinstaller ${{ env.spec-file-path }} + + - name: Upload build + uses: actions/upload-artifact@v3 + with: + name: Mys_Goods_Tool_v2-Alpine-i386 + path: | + dist/${{ env.executable-file-name }}* + README.md \ No newline at end of file From 9e7f34e92bc384df437ac4ecb3ae8732b360a1c5 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:40:01 +0800 Subject: [PATCH 05/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddocker=20image=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 890e41cc..d555ec06 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -36,7 +36,6 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 with: - image: 'i386/alpine:latest' platforms: 'i386' - name: Install Anaconda Distribution From a1715b01eef62a3f701d63eca48e05faf3da4bc2 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:44:20 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2.yml | 21 ++++++--------------- .github/workflows/python-package.yml | 19 +++++-------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-v2.yml b/.github/workflows/build-v2.yml index 134581bf..27352882 100644 --- a/.github/workflows/build-v2.yml +++ b/.github/workflows/build-v2.yml @@ -2,21 +2,12 @@ name: Build (v2) on: workflow_dispatch: - push: - path: - - 'mys_goods_tool/**' - - '.github/workflows/build-v2.yml' - - '__init__.py' - - 'Mys_Goods_Tool.spec' - - 'pyproject.toml' - - pull_request: - path: - - 'mys_goods_tool/**' - - '.github/workflows/build-v2.yml' - - '__init__.py' - - 'Mys_Goods_Tool.spec' - - 'pyproject.toml' + path: + - 'mys_goods_tool/**' + - '.github/workflows/build-v2.yml' + - '__init__.py' + - 'Mys_Goods_Tool.spec' + - 'pyproject.toml' permissions: contents: read diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7dabe52c..d3905618 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -2,20 +2,11 @@ name: Multiple Python Versions Test on: workflow_dispatch: - push: - path: - path: - - 'mys_goods_tool/**' - - '.github/workflows/python-package.yml' - - '__init__.py' - - 'pyproject.toml' - - pull_request: - path: - - 'mys_goods_tool/**' - - '.github/workflows/python-package.yml' - - '__init__.py' - - 'pyproject.toml' + path: + - 'mys_goods_tool/**' + - '.github/workflows/python-package.yml' + - '__init__.py' + - 'pyproject.toml' permissions: contents: read From 58268456b72c0520fc514401983215f08d593ded Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:46:26 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E6=95=B4conda?= =?UTF-8?q?=20init=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index d555ec06..c104b159 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -5,7 +5,7 @@ on: push: path: - 'mys_goods_tool/**' - - '.github/workflows/build-v2.yml' + - '.github/workflows/build-v2-i386_alpine.yml' - '__init__.py' - 'Mys_Goods_Tool.spec' - 'pyproject.toml' @@ -13,7 +13,7 @@ on: pull_request: path: - 'mys_goods_tool/**' - - '.github/workflows/build-v2.yml' + - '.github/workflows/build-v2-i386_alpine.yml' - '__init__.py' - 'Mys_Goods_Tool.spec' - 'pyproject.toml' @@ -43,7 +43,7 @@ jobs: curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$($HOME/bin/conda shell.bash hook)" - conda init + conda init bash - name: Install dependencies run : | From 8453063af1bf3627523640e663b8c9ce90b9ee5d Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 01:50:08 +0800 Subject: [PATCH 08/46] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=94=B9=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E5=99=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a1715b01eef62a3f701d63eca48e05faf3da4bc2. --- .github/workflows/build-v2.yml | 21 +++++++++++++++------ .github/workflows/python-package.yml | 19 ++++++++++++++----- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-v2.yml b/.github/workflows/build-v2.yml index 27352882..134581bf 100644 --- a/.github/workflows/build-v2.yml +++ b/.github/workflows/build-v2.yml @@ -2,12 +2,21 @@ name: Build (v2) on: workflow_dispatch: - path: - - 'mys_goods_tool/**' - - '.github/workflows/build-v2.yml' - - '__init__.py' - - 'Mys_Goods_Tool.spec' - - 'pyproject.toml' + push: + path: + - 'mys_goods_tool/**' + - '.github/workflows/build-v2.yml' + - '__init__.py' + - 'Mys_Goods_Tool.spec' + - 'pyproject.toml' + + pull_request: + path: + - 'mys_goods_tool/**' + - '.github/workflows/build-v2.yml' + - '__init__.py' + - 'Mys_Goods_Tool.spec' + - 'pyproject.toml' permissions: contents: read diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d3905618..7dabe52c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -2,11 +2,20 @@ name: Multiple Python Versions Test on: workflow_dispatch: - path: - - 'mys_goods_tool/**' - - '.github/workflows/python-package.yml' - - '__init__.py' - - 'pyproject.toml' + push: + path: + path: + - 'mys_goods_tool/**' + - '.github/workflows/python-package.yml' + - '__init__.py' + - 'pyproject.toml' + + pull_request: + path: + - 'mys_goods_tool/**' + - '.github/workflows/python-package.yml' + - '__init__.py' + - 'pyproject.toml' permissions: contents: read From 51f6a36aab043ab26a1f0434a5c0d50bd902c3f7 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:02:33 +0800 Subject: [PATCH 09/46] =?UTF-8?q?docker=E5=A2=9E=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E8=A3=85i386/alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index c104b159..e4438b71 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -24,7 +24,6 @@ permissions: env: # Initialize vars context by reading it from env context _: ${{ vars._ }} - windows-poetry-path: C:\Users\runneradmin\AppData\Roaming\Python\Scripts\poetry spec-file-path: Mys_Goods_Tool.spec jobs: @@ -37,16 +36,19 @@ jobs: uses: docker/setup-qemu-action@v2 with: platforms: 'i386' + run: | + docker run --rm --privileged i386/alpine - name: Install Anaconda Distribution run: | + docker exec -i -t i386/alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$($HOME/bin/conda shell.bash hook)" - conda init bash - name: Install dependencies run : | + conda init bash conda create -n build python=3.11 conda activate build curl -sSL https://install.python-poetry.org | python3 - From f1a02c1423b42235026fe3731dcfa0b69365e5bc Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:05:27 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9Ca=20step=20can?= =?UTF-8?q?not=20have=20both=20the=20`uses`=20and=20`run`=20keys=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index e4438b71..cb2bca8a 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -36,8 +36,10 @@ jobs: uses: docker/setup-qemu-action@v2 with: platforms: 'i386' + + - name: Install i386 Alpine run: | - docker run --rm --privileged i386/alpine + docker run --rm --privileged i386/alpine uname -a - name: Install Anaconda Distribution run: | From 0e066235070c9a217d01e583f04bfc71cc6d8d78 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:08:18 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9CError:=20No=20?= =?UTF-8?q?such=20container:=20i386/alpine=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index cb2bca8a..693d8115 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -43,7 +43,7 @@ jobs: - name: Install Anaconda Distribution run: | - docker exec -i -t i386/alpine /bin/bash + docker exec -it alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$($HOME/bin/conda shell.bash hook)" From 47f834fbacdcc076954ca272747b73b597fd855e Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:11:55 +0800 Subject: [PATCH 12/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9CError:=20No=20?= =?UTF-8?q?such=20container:=20i386/alpine=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 693d8115..dcd0636d 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -39,7 +39,7 @@ jobs: - name: Install i386 Alpine run: | - docker run --rm --privileged i386/alpine uname -a + docker run --name=alpine --rm --privileged i386/alpine uname -a - name: Install Anaconda Distribution run: | From e6043105a38be7052df537cd899079b47ee6b268 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:18:00 +0800 Subject: [PATCH 13/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpath=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E5=99=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- .github/workflows/build-v2.yml | 4 ++-- .github/workflows/python-package.yml | 13 ++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index dcd0636d..ae8da2c0 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -3,7 +3,7 @@ name: Build (i386 Alpine, v2) on: workflow_dispatch: push: - path: + paths: - 'mys_goods_tool/**' - '.github/workflows/build-v2-i386_alpine.yml' - '__init__.py' @@ -11,7 +11,7 @@ on: - 'pyproject.toml' pull_request: - path: + paths: - 'mys_goods_tool/**' - '.github/workflows/build-v2-i386_alpine.yml' - '__init__.py' diff --git a/.github/workflows/build-v2.yml b/.github/workflows/build-v2.yml index 134581bf..dc7619ac 100644 --- a/.github/workflows/build-v2.yml +++ b/.github/workflows/build-v2.yml @@ -3,7 +3,7 @@ name: Build (v2) on: workflow_dispatch: push: - path: + paths: - 'mys_goods_tool/**' - '.github/workflows/build-v2.yml' - '__init__.py' @@ -11,7 +11,7 @@ on: - 'pyproject.toml' pull_request: - path: + paths: - 'mys_goods_tool/**' - '.github/workflows/build-v2.yml' - '__init__.py' diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7dabe52c..ff85fd29 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -3,15 +3,14 @@ name: Multiple Python Versions Test on: workflow_dispatch: push: - path: - path: - - 'mys_goods_tool/**' - - '.github/workflows/python-package.yml' - - '__init__.py' - - 'pyproject.toml' + paths: + - 'mys_goods_tool/**' + - '.github/workflows/python-package.yml' + - '__init__.py' + - 'pyproject.toml' pull_request: - path: + paths: - 'mys_goods_tool/**' - '.github/workflows/python-package.yml' - '__init__.py' From 2521d437908728f703e461e12b044266bfb1ba71 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:22:03 +0800 Subject: [PATCH 14/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E5=AE=B9=E5=99=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index ae8da2c0..41768d3c 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -39,11 +39,11 @@ jobs: - name: Install i386 Alpine run: | - docker run --name=alpine --rm --privileged i386/alpine uname -a + docker run --rm --privileged i386/alpine uname -a - name: Install Anaconda Distribution run: | - docker exec -it alpine /bin/bash + uname -a curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$($HOME/bin/conda shell.bash hook)" From b340c9d9cdcb6ac957ad4470f9a30938d7d44e28 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:26:39 +0800 Subject: [PATCH 15/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D"/home/runner/bin/conda?= =?UTF-8?q?:=20No=20such=20file=20or=20directory"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 41768d3c..de998338 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -46,7 +46,7 @@ jobs: uname -a curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda - eval "$($HOME/bin/conda shell.bash hook)" + eval "$(conda shell.bash hook)" - name: Install dependencies run : | From 4288e0390250de4c396bc2e5172bb091e42d6900 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:33:43 +0800 Subject: [PATCH 16/46] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=BF=9B=E5=85=A5alpin?= =?UTF-8?q?e=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index de998338..7dea9686 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -39,17 +39,18 @@ jobs: - name: Install i386 Alpine run: | - docker run --rm --privileged i386/alpine uname -a + docker run -d --name alpine --rm --privileged i386/alpine uname -a - name: Install Anaconda Distribution run: | - uname -a + docker exec -it alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" - name: Install dependencies run : | + docker exec -it alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From 314959c5f6dd7560ed7fbc9875e3761c8d325fdb Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:41:01 +0800 Subject: [PATCH 17/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dthe=20input=20device=20?= =?UTF-8?q?is=20not=20a=20TTY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 7dea9686..93808ade 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -43,14 +43,14 @@ jobs: - name: Install Anaconda Distribution run: | - docker exec -it alpine /bin/bash + docker exec -i -t alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" - name: Install dependencies run : | - docker exec -it alpine /bin/bash + docker exec -i -t alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From 7ea70f89c1dc139f43b5af26a39bbb2a0f74d6d0 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:43:26 +0800 Subject: [PATCH 18/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dthe=20input=20device=20?= =?UTF-8?q?is=20not=20a=20TTY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 93808ade..1bf6e033 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -43,14 +43,14 @@ jobs: - name: Install Anaconda Distribution run: | - docker exec -i -t alpine /bin/bash + docker exec -i alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" - name: Install dependencies run : | - docker exec -i -t alpine /bin/bash + docker exec -i alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From 15a2443136e1eb3e19133a83167908a9685a3a11 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:45:10 +0800 Subject: [PATCH 19/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError=20response=20from?= =?UTF-8?q?=20daemon:=20No=20such=20container:=20alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 1bf6e033..22552d72 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -43,14 +43,14 @@ jobs: - name: Install Anaconda Distribution run: | - docker exec -i alpine /bin/bash + docker exec -i i386/alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" - name: Install dependencies run : | - docker exec -i alpine /bin/bash + docker exec -i i386/alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From 1494458db0a529a9927ad15118bfb85f88f16aed Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 02:58:20 +0800 Subject: [PATCH 20/46] =?UTF-8?q?=E5=9C=A8step=E4=B9=8B=E9=97=B4=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E5=AE=B9=E5=99=A8ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 22552d72..bcdc513c 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -25,6 +25,7 @@ env: # Initialize vars context by reading it from env context _: ${{ vars._ }} spec-file-path: Mys_Goods_Tool.spec + container-id: jobs: build: @@ -39,18 +40,19 @@ jobs: - name: Install i386 Alpine run: | - docker run -d --name alpine --rm --privileged i386/alpine uname -a + container-id=`docker run -d --rm --privileged i386/alpine` + echo "container-id=$container-id" >> "$GITHUB_ENV" - name: Install Anaconda Distribution run: | - docker exec -i i386/alpine /bin/bash + docker exec -i ${{ env.container-id }} /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" - name: Install dependencies run : | - docker exec -i i386/alpine /bin/bash + docker exec -i ${{ env.container-id }} /bin/bash conda init bash conda create -n build python=3.11 conda activate build From d1374e9d6e51ceeabe93b765c28fa627aad3b8b5 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:03:41 +0800 Subject: [PATCH 21/46] =?UTF-8?q?=E6=9B=B4=E6=94=B9Shell=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index bcdc513c..2aaca3d3 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,8 +40,8 @@ jobs: - name: Install i386 Alpine run: | - container-id=`docker run -d --rm --privileged i386/alpine` - echo "container-id=$container-id" >> "$GITHUB_ENV" + container_id=`docker run -d --rm --privileged i386/alpine` + echo "container-id=$container_id" >> "$GITHUB_ENV" - name: Install Anaconda Distribution run: | From 3d5efae3c9185b0689c7ce741ce51c2bdd285be7 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:07:25 +0800 Subject: [PATCH 22/46] =?UTF-8?q?docker=E6=9F=A5=E7=9C=8B=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 2aaca3d3..f4fe16d0 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -45,6 +45,7 @@ jobs: - name: Install Anaconda Distribution run: | + docker ps -a docker exec -i ${{ env.container-id }} /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda From e661c5579dd0e51dc0013fdf3306535497e20c61 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:18:18 +0800 Subject: [PATCH 23/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError=20response=20from?= =?UTF-8?q?=20daemon:=20No=20such=20container:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index f4fe16d0..f83eb04a 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,8 @@ jobs: - name: Install i386 Alpine run: | - container_id=`docker run -d --rm --privileged i386/alpine` + docker run -d --name alpine --rm --privileged i386/alpine + container_id=docker ps -aqf "name=alpine" echo "container-id=$container_id" >> "$GITHUB_ENV" - name: Install Anaconda Distribution From 61a9dfc3f5f68c0b99d68147ab9a77e17f5bd11b Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:18:18 +0800 Subject: [PATCH 24/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError=20response=20from?= =?UTF-8?q?=20daemon:=20No=20such=20container:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index f4fe16d0..74633f45 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,8 @@ jobs: - name: Install i386 Alpine run: | - container_id=`docker run -d --rm --privileged i386/alpine` + docker run -d --name alpine --rm --privileged i386/alpine + container_id=`docker ps -aqf "name=alpine"` echo "container-id=$container_id" >> "$GITHUB_ENV" - name: Install Anaconda Distribution From 8d95f1c142110ed5521e221a0ad02cb7e0bde1b1 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:35:10 +0800 Subject: [PATCH 25/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError=20response=20from?= =?UTF-8?q?=20daemon:=20No=20such=20container:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 74633f45..41e84715 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,7 @@ jobs: - name: Install i386 Alpine run: | - docker run -d --name alpine --rm --privileged i386/alpine + docker run -d --name alpine --rm --privileged i386/alpine /bin/bash container_id=`docker ps -aqf "name=alpine"` echo "container-id=$container_id" >> "$GITHUB_ENV" @@ -54,7 +54,7 @@ jobs: - name: Install dependencies run : | - docker exec -i ${{ env.container-id }} /bin/bash + docker exec -i alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From b232550cb30ce68716c03b017fb7ba1bf2550310 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 03:37:28 +0800 Subject: [PATCH 26/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D/bin/bash:=20no=20such?= =?UTF-8?q?=20file=20or=20directory:=20unknown.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 41e84715..529dd208 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,7 @@ jobs: - name: Install i386 Alpine run: | - docker run -d --name alpine --rm --privileged i386/alpine /bin/bash + docker run -d --name alpine --rm --privileged i386/alpine container_id=`docker ps -aqf "name=alpine"` echo "container-id=$container_id" >> "$GITHUB_ENV" From 2199615c823b4d7cc0ee296d9dfc46f484454ec1 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:29:55 +0800 Subject: [PATCH 27/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError:=20No=20such=20co?= =?UTF-8?q?ntainer:=207897032ab4b0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 529dd208..e5776c10 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -47,7 +47,8 @@ jobs: - name: Install Anaconda Distribution run: | docker ps -a - docker exec -i ${{ env.container-id }} /bin/bash + docker start alpine + docker exec -i alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" From ddc3820c3d814f27842268480414d69321897818 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:33:08 +0800 Subject: [PATCH 28/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError:=20failed=20to=20?= =?UTF-8?q?start=20containers:=20alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index e5776c10..e4fc7373 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -47,7 +47,6 @@ jobs: - name: Install Anaconda Distribution run: | docker ps -a - docker start alpine docker exec -i alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda From 1eed6abe644f0bd49783ccaad006d48efb6cc0e7 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:36:14 +0800 Subject: [PATCH 29/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError:=20failed=20to=20?= =?UTF-8?q?start=20containers:=20alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index e4fc7373..24366090 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,14 +40,14 @@ jobs: - name: Install i386 Alpine run: | - docker run -d --name alpine --rm --privileged i386/alpine + docker run --name alpine --rm --privileged i386/alpine container_id=`docker ps -aqf "name=alpine"` echo "container-id=$container_id" >> "$GITHUB_ENV" - name: Install Anaconda Distribution run: | docker ps -a - docker exec -i alpine /bin/bash + docker start -i alpine /bin/bash curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" From 22ebc3804f4111d9a081a7ea6054bdd74624da95 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:37:56 +0800 Subject: [PATCH 30/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dyou=20cannot=20start=20?= =?UTF-8?q?and=20attach=20multiple=20containers=20at=20once?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 24366090..5ee1a95a 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -41,13 +41,13 @@ jobs: - name: Install i386 Alpine run: | docker run --name alpine --rm --privileged i386/alpine - container_id=`docker ps -aqf "name=alpine"` - echo "container-id=$container_id" >> "$GITHUB_ENV" + uname -a + - name: Install Anaconda Distribution run: | docker ps -a - docker start -i alpine /bin/bash + uname -a curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh bash ./miniconda.sh -b -p $HOME/miniconda eval "$(conda shell.bash hook)" From a72c0a90c329a644c1184e76f02a686a11d931f2 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:44:02 +0800 Subject: [PATCH 31/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError:=20No=20such=20co?= =?UTF-8?q?ntainer:=20alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 5ee1a95a..254fe6f3 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,7 @@ jobs: - name: Install i386 Alpine run: | - docker run --name alpine --rm --privileged i386/alpine + docker run -dt --name alpine --rm --privileged i386/alpine uname -a From 410f561b4ad4f2735e03ea063a55f33285c3d086 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 04:46:55 +0800 Subject: [PATCH 32/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8DError:=20No=20such=20co?= =?UTF-8?q?ntainer:=20alpine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 254fe6f3..6fc23c3c 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -40,7 +40,7 @@ jobs: - name: Install i386 Alpine run: | - docker run -dt --name alpine --rm --privileged i386/alpine + docker run -t --name alpine --rm --privileged i386/alpine uname -a From 363eb77a5b07b70a3744e8098213298b09a8ea87 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 05:01:29 +0800 Subject: [PATCH 33/46] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8Ddocke?= =?UTF-8?q?r=E7=9B=B8=E5=85=B3=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 6fc23c3c..35a091de 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -25,7 +25,7 @@ env: # Initialize vars context by reading it from env context _: ${{ vars._ }} spec-file-path: Mys_Goods_Tool.spec - container-id: + DOCKER_COMMAND: docker run --name alpine --rm --privileged i386/alpine jobs: build: @@ -38,19 +38,11 @@ jobs: with: platforms: 'i386' - - name: Install i386 Alpine + - name: Install i386 Alpine and Anaconda run: | - docker run -t --name alpine --rm --privileged i386/alpine - uname -a - - - - name: Install Anaconda Distribution - run: | - docker ps -a - uname -a - curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh - bash ./miniconda.sh -b -p $HOME/miniconda - eval "$(conda shell.bash hook)" + echo `$DOCKER_COMMAND curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh` + echo `$DOCKER_COMMAND bash ./miniconda.sh -b -p $HOME/miniconda` + echo `$DOCKER_COMMAND eval "$(conda shell.bash hook)"` - name: Install dependencies run : | From 9baf92eee333e5c3c444f3d2caf364991cea5d3d Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:05:42 +0800 Subject: [PATCH 34/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8balenalib/qemux86-alpin?= =?UTF-8?q?e-python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 35a091de..d9eda115 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -25,28 +25,22 @@ env: # Initialize vars context by reading it from env context _: ${{ vars._ }} spec-file-path: Mys_Goods_Tool.spec - DOCKER_COMMAND: docker run --name alpine --rm --privileged i386/alpine + container-id: jobs: build: runs-on: ubuntu-latest - + container: balenalib/qemux86-alpine-python steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: 'i386' - - - name: Install i386 Alpine and Anaconda + - name: Install Anaconda Distribution run: | - echo `$DOCKER_COMMAND curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -o ./miniconda.sh` - echo `$DOCKER_COMMAND bash ./miniconda.sh -b -p $HOME/miniconda` - echo `$DOCKER_COMMAND eval "$(conda shell.bash hook)"` + wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -O ./miniconda.sh + bash ./miniconda.sh -b -p $HOME/miniconda + eval "$(conda shell.bash hook)" - name: Install dependencies run : | - docker exec -i alpine /bin/bash conda init bash conda create -n build python=3.11 conda activate build From d4a26fa4a944650bf9fea13a09dbcf2c6715f852 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:09:26 +0800 Subject: [PATCH 35/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8balenalib/qemux86-alpin?= =?UTF-8?q?e-python=E8=87=AA=E5=B8=A6=E7=9A=84python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index d9eda115..e4910689 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -33,17 +33,8 @@ jobs: runs-on: ubuntu-latest container: balenalib/qemux86-alpine-python steps: - - name: Install Anaconda Distribution - run: | - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -O ./miniconda.sh - bash ./miniconda.sh -b -p $HOME/miniconda - eval "$(conda shell.bash hook)" - - name: Install dependencies run : | - conda init bash - conda create -n build python=3.11 - conda activate build curl -sSL https://install.python-poetry.org | python3 - poetry install --with pyinstaller From 9a7d4d238714ded2fdfbdc87fbfde99baa151d92 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:09:26 +0800 Subject: [PATCH 36/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8balenalib/qemux86-alpin?= =?UTF-8?q?e-python=E8=87=AA=E5=B8=A6=E7=9A=84python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index d9eda115..e4910689 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -33,17 +33,8 @@ jobs: runs-on: ubuntu-latest container: balenalib/qemux86-alpine-python steps: - - name: Install Anaconda Distribution - run: | - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86.sh -O ./miniconda.sh - bash ./miniconda.sh -b -p $HOME/miniconda - eval "$(conda shell.bash hook)" - - name: Install dependencies run : | - conda init bash - conda create -n build python=3.11 - conda activate build curl -sSL https://install.python-poetry.org | python3 - poetry install --with pyinstaller From 2a42a07cf873f7ef97e208dd7e4acdfe32fffd0e Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:17:38 +0800 Subject: [PATCH 37/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8balenalib/qemux86-alpin?= =?UTF-8?q?e-python=E8=87=AA=E5=B8=A6=E7=9A=84python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index e4910689..d32e1ed0 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -35,6 +35,7 @@ jobs: steps: - name: Install dependencies run : | + uname -a curl -sSL https://install.python-poetry.org | python3 - poetry install --with pyinstaller From 9e8d66340a86a9f1230bcc87966078975eed3068 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:23:12 +0800 Subject: [PATCH 38/46] cross-build-start --- .github/workflows/build-v2-i386_alpine.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index d32e1ed0..f3214763 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -35,6 +35,7 @@ jobs: steps: - name: Install dependencies run : | + cross-build-start uname -a curl -sSL https://install.python-poetry.org | python3 - poetry install --with pyinstaller From a9c506e11fca24a40d5b90dab1263d1b7deba8e2 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:25:29 +0800 Subject: [PATCH 39/46] =?UTF-8?q?=E6=B5=8B=E8=AF=95cross-build-start?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index f3214763..8c935e3a 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies run : | cross-build-start - uname -a + python -V curl -sSL https://install.python-poetry.org | python3 - poetry install --with pyinstaller From 3a672b2990f103b4b31042e31b069142ae0454b0 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:26:54 +0800 Subject: [PATCH 40/46] pip install poetry --- .github/workflows/build-v2-i386_alpine.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 8c935e3a..d14461f7 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -36,8 +36,8 @@ jobs: - name: Install dependencies run : | cross-build-start - python -V - curl -sSL https://install.python-poetry.org | python3 - + pip install --upgrade pip + pip install poetry poetry install --with pyinstaller - name: Build From b8f4486a7fa8f95894f8afd9f49eafaacde3bdc0 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 06:53:13 +0800 Subject: [PATCH 41/46] =?UTF-8?q?=E4=BD=BF=E7=94=A8qemu-i386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index d14461f7..44946481 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -35,10 +35,8 @@ jobs: steps: - name: Install dependencies run : | - cross-build-start - pip install --upgrade pip - pip install poetry - poetry install --with pyinstaller + qemu-i386 curl -sSL https://install.python-poetry.org | python3 - + qemu-i386 poetry install --with pyinstaller - name: Build run: | From ab732d550a39d699463b6e9a6d287574d5982e09 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 07:32:07 +0800 Subject: [PATCH 42/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E5=86=99=E5=85=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mys_goods_tool/user_data.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mys_goods_tool/user_data.py b/mys_goods_tool/user_data.py index 0b9be2fa..f6308e08 100644 --- a/mys_goods_tool/user_data.py +++ b/mys_goods_tool/user_data.py @@ -306,11 +306,14 @@ class Preference(BaseSettings): @validator("log_path") def _(cls, v: Optional[Path]): absolute_path = v.absolute() - if os.path.exists(absolute_path) and os.path.isfile(absolute_path): - if not os.access(absolute_path, os.W_OK): - logger.warning(f"程序没有写入日志文件 {absolute_path} 的权限") - elif not os.access(absolute_path.parent, os.W_OK): - logger.warning(f"程序没有写入日志目录 {absolute_path.parent} 的权限") + if not os.path.exists(absolute_path) or not os.path.isfile(absolute_path): + try: + with open(absolute_path, "w"): + pass + except OSError: + pass + if not os.access(absolute_path, os.W_OK): + logger.warning(f"程序没有写入日志文件 {absolute_path} 的权限") return v class Config: From 93b352f808b91f19acec33c29c912900393778e1 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 07:49:34 +0800 Subject: [PATCH 43/46] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E5=86=99=E5=85=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mys_goods_tool/user_data.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mys_goods_tool/user_data.py b/mys_goods_tool/user_data.py index f6308e08..a799009f 100644 --- a/mys_goods_tool/user_data.py +++ b/mys_goods_tool/user_data.py @@ -307,12 +307,12 @@ class Preference(BaseSettings): def _(cls, v: Optional[Path]): absolute_path = v.absolute() if not os.path.exists(absolute_path) or not os.path.isfile(absolute_path): + absolute_parent = absolute_path.parent try: - with open(absolute_path, "w"): - pass - except OSError: - pass - if not os.access(absolute_path, os.W_OK): + os.makedirs(absolute_parent, exist_ok=True) + except PermissionError: + logger.warning(f"程序没有创建日志目录 {absolute_parent} 的权限") + elif not os.access(absolute_path, os.W_OK): logger.warning(f"程序没有写入日志文件 {absolute_path} 的权限") return v From 51f31f4d5007d12a7fa3f00a3ae6ab1865d43feb Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Thu, 4 May 2023 17:11:25 +0800 Subject: [PATCH 44/46] =?UTF-8?q?=E5=88=A0=E9=99=A4pypercilp=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E3=80=81=E6=9B=B4=E6=96=B0textual=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 3 +-- requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4fb50f1c..fe2476b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,12 +26,11 @@ tenacity = "^8.2.2" requests = "^2.29.0" ping3 = "^4.0.4" ntplib = "^0.4.0" -pyperclip = "^1.8.2" pydantic = "^1.10.6" loguru = "^0.7.0" httpx = "^0.24.0" rich = "^13.3.5" -textual = "^0.22.3" +textual = "^0.23.0" socksio = "^1.0.0" apscheduler = "^3.10.1" diff --git a/requirements.txt b/requirements.txt index 68cf3d60..7bbf6a24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,12 +5,11 @@ tenacity~=8.2.2 requests~=2.29.0 ping3~=4.0.4 ntplib~=0.4.0 -pyperclip~=1.8.2 pydantic~=1.10.6 loguru~=0.7.0 httpx~=0.24.0 rich~=13.3.5 -textual~=0.22.3 +textual~=0.23.0 socksio~=1.0.0 apscheduler~=3.10.1 From e5504d5e5eb2b18daaf849f21108d28905a77263 Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Fri, 5 May 2023 04:28:17 +0800 Subject: [PATCH 45/46] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=9A=82=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BB=85=E5=85=81=E8=AE=B8=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-v2-i386_alpine.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/build-v2-i386_alpine.yml b/.github/workflows/build-v2-i386_alpine.yml index 44946481..f6bf14e6 100644 --- a/.github/workflows/build-v2-i386_alpine.yml +++ b/.github/workflows/build-v2-i386_alpine.yml @@ -2,21 +2,6 @@ name: Build (i386 Alpine, v2) on: workflow_dispatch: - push: - paths: - - 'mys_goods_tool/**' - - '.github/workflows/build-v2-i386_alpine.yml' - - '__init__.py' - - 'Mys_Goods_Tool.spec' - - 'pyproject.toml' - - pull_request: - paths: - - 'mys_goods_tool/**' - - '.github/workflows/build-v2-i386_alpine.yml' - - '__init__.py' - - 'Mys_Goods_Tool.spec' - - 'pyproject.toml' permissions: contents: read From f6ac7e9c09cb8bcb7c437db1bf489762feac956e Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Fri, 5 May 2023 04:31:20 +0800 Subject: [PATCH 46/46] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mys_goods_tool/user_data.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mys_goods_tool/user_data.py b/mys_goods_tool/user_data.py index a799009f..c4c59e94 100644 --- a/mys_goods_tool/user_data.py +++ b/mys_goods_tool/user_data.py @@ -17,7 +17,7 @@ CONFIG_PATH = ROOT_PATH / "user_data.json" """用户数据文件默认路径""" -VERSION = "2.0.0-beta.1" +VERSION = "2.0.0" """程序当前版本""" if TYPE_CHECKING: diff --git a/pyproject.toml b/pyproject.toml index fe2476b4..5fa55e8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mys-goods-tool" -version = "2.0.0-beta.1" +version = "2.0.0" description = "米游社商品兑换工具|短信验证登录|终端TUI界面" authors = ["Ljzd-PRO "] readme = "README.md"