Skip to content

Commit 39e0ccf

Browse files
committed
fix: macosはDockerのインストールが長すぎるので直書きに修正
1 parent 0e15858 commit 39e0ccf

File tree

3 files changed

+33
-36
lines changed

3 files changed

+33
-36
lines changed

.github/workflows/mac.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,32 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v2
1414

15-
- name: Install Docker on macOS
16-
run: |
17-
brew install --cask docker
18-
open /Applications/Docker.app
19-
while ! docker system info > /dev/null 2>&1; do sleep 1; done
15+
- name: Set up Python
16+
uses: actions/setup-python@v2
17+
with:
18+
python-version: '3.12.0'
2019

21-
- name: Build Docker image
22-
run: docker build --no-cache -f ./linux/Dockerfile -t pyinstaller-linux .
20+
- name: Install dependencies
21+
run: |
22+
python -m pip install --upgrade pip
23+
pip install --no-cache-dir pyzipper requests pyinstaller TkEasyGUI openai
2324
2425
- name: Create dist directory
25-
run: mkdir -p macos/dist
26+
run: mkdir -p ./dist
2627

27-
- name: Run Docker container
28-
run: docker run --rm -v "${{ github.workspace }}/macos/dist:/dist" \
29-
pyinstaller-linux pyinstaller main.py \
28+
- name: Build with PyInstaller
29+
run: |
30+
pyinstaller main.py \
3031
--onedir --onefile --clean --console \
31-
--distpath /dist \
32-
--workpath /build \
33-
--specpath /
32+
--distpath ./dist \
33+
--workpath ./build \
34+
--specpath ./
3435
3536
- name: Check Artifacts
36-
run: ls -R ./macos/dist
37+
run: ls -R ./dist
3738

3839
- name: Upload artifact
3940
uses: actions/upload-artifact@v2
4041
with:
4142
name: minecraft-mods-localizer-macos
42-
path: ./macos/dist/main
43+
path: ./dist/main

.github/workflows/release.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,31 @@ jobs:
3333
- name: Checkout repository
3434
uses: actions/checkout@v2
3535

36-
- name: Install Docker on macOS
37-
run: |
38-
brew install --cask docker
39-
open /Applications/Docker.app
40-
while ! docker system info > /dev/null 2>&1; do sleep 1; done
36+
- name: Set up Python
37+
uses: actions/setup-python@v2
38+
with:
39+
python-version: '3.12.0'
4140

42-
- name: Build Docker image
43-
run: docker build --no-cache -f ./linux/Dockerfile -t pyinstaller-linux .
41+
- name: Install dependencies
42+
run: |
43+
python -m pip install --upgrade pip
44+
pip install --no-cache-dir pyzipper requests pyinstaller TkEasyGUI openai
4445
4546
- name: Create dist directory
46-
run: mkdir -p macos/dist
47+
run: mkdir -p ./dist
4748

48-
- name: Run Docker container
49-
run: docker run --rm -v "${{ github.workspace }}/src:/src" -v "${{ github.workspace }}/macos:/macos" \
50-
pyinstaller-linux pyinstaller main.py \
51-
--name minecraft-mods-localizer-macos-${{ github.ref_name }} \
52-
--onedir --onefile --clean --console \
53-
--distpath /macos/dist \
54-
--workpath /macos/build \
55-
--specpath /macos
49+
- name: Build with PyInstaller
50+
run: |
51+
pyinstaller --name minecraft-mods-localizer-macos-${{ github.ref_name }} --onefile --clean --console --distpath ./dist --workpath ./build src/main.py
5652
5753
- name: Check Artifacts
58-
run: ls -R ./macos/dist
54+
run: ls -R ./dist
5955

6056
- name: Upload artifact
6157
uses: actions/upload-artifact@v2
6258
with:
6359
name: minecraft-mods-localizer-macos
64-
path: ./macos/dist/minecraft-mods-localizer-macos-${{ github.ref_name }}
60+
path: ./dist/minecraft-mods-localizer-macos-${{ github.ref_name }}
6561

6662
build-linux:
6763
runs-on: ubuntu-latest
@@ -91,7 +87,7 @@ jobs:
9187
with:
9288
name: minecraft-mods-localizer-linux
9389
path: ./linux/dist/minecraft-mods-localizer-linux-${{ github.ref_name }}
94-
90+
9591
create-release:
9692
needs:
9793
- build-linux

src/init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
USER = 'Y-RyuZU'
1414
REPO = 'MinecraftModsLocalizer'
15-
VERSION = 'v2.1.2'
15+
VERSION = 'v2.1.3'

0 commit comments

Comments
 (0)