Skip to content
This repository was archived by the owner on Jun 28, 2025. It is now read-only.

Commit 293d0df

Browse files
committed
chore: fix merge conflicts.
2 parents 33c7561 + 0635c33 commit 293d0df

File tree

13 files changed

+45
-56
lines changed

13 files changed

+45
-56
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
update-file:
10-
runs-on: ubuntu-latest
10+
runs-on: windows-latest
1111

1212
steps:
1313
# 检出代码仓库
@@ -29,15 +29,16 @@ jobs:
2929
# 运行你的 Python 脚本
3030
- name: Start Building Via Nuitka
3131
run: |
32-
python -m nuitka --standalone --onefile --enable-plugin=pyqt5 --include-package=PyQt5 --include-package=PyQt5.QtSvg --include-package=PyQt5.QtCore --include-package=PyQt5.QtGui --include-package=PyQt5.QtWidgets --windows-icon-from-ico=./Plain_Craft_Launcher_2/Images/icon.ico --output-dir=dist --windows-console-mode=disable --follow-imports --remove-output --assume-yes-for-downloads --show-progress --show-memory --include-data-dir=./Plain_Craft_Launcher_2/Images=Images --include-module=_ctypes ./Plain_Craft_Launcher_2/Application.py
33-
32+
cd Plain_Craft_Launcher_2
33+
.\build.cmd
34+
3435
# 配置 Git 推送
3536
- name: Commit and push changes
3637
env:
3738
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # 使用 GitHub 内置的 Token
3839
run: |
3940
git config --global user.name "github-actions[bot]"
4041
git config --global user.email "github-actions[bot]@users.noreply.github.com"
41-
git add Custom.xaml
42-
git commit -m "Update Custom.xaml with new Wiki content"
43-
git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/CreeperIsASpy/WikiHomepage-PCL.git HEAD:main
42+
git add .
43+
git commit -m "Build new binary distribution for Application.py."
44+
git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/PCL-Community/PCL2-Python.git HEAD:main

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Editor Config
2-
idea/
2+
.idea/
33
.vs/
4+
.vscode/
45

56
# Python Environment & Cache
67
**/*venv*/

.idea/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/MCL.iml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.
-738 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)