Skip to content

Commit d310182

Browse files
author
arch
committed
changes to install json.lua
1 parent 1adcd62 commit d310182

File tree

6 files changed

+471
-60
lines changed

6 files changed

+471
-60
lines changed

.github/workflows/prerelease_windows_application.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,63 @@ jobs:
1111
matrix:
1212
os: ["windows-latest"]
1313
steps:
14+
1415
- name: Checkout Repository
1516
uses: actions/checkout@v2
17+
1618
- name: Setup Miniconda
1719
uses: conda-incubator/setup-miniconda@v2
1820
with:
1921
activate-environment: build
2022
environment-file: environment_windows.yaml
2123
python-version: 3.9
2224
auto-activate-base: false
25+
2326
- name: Collect Conda Info
2427
shell: bash -l {0}
2528
run: |
2629
conda info
2730
conda env export
31+
2832
- name: Build Application Documentation
2933
shell: bash -l {0}
3034
run: |
3135
cd docs/app
3236
mkdocs build
3337
cd ../..
38+
3439
- name: Build Application
3540
shell: bash -l {0}
3641
run: |
3742
pyinstaller --add-data="funscript_editor/config/*;funscript_editor/config" --add-data="assets/*;." --hidden-import "pynput.keyboard._win32" --hidden-import "pynput.mouse._win32" --noupx --icon=icon.ico funscript-editor.py
43+
3844
- name: Move Documentation to Application Build Directory
3945
shell: bash -l {0}
4046
run: |
4147
mv "docs/app/site" "dist/funscript-editor/funscript_editor/docs"
42-
- name: Add MTFG OFS Extension
48+
49+
- name: Create OFS Files Directory
4350
shell: bash -l {0}
4451
run: |
45-
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/main.lua"
52+
mkdir -p "dist/funscript-editor/OFS"
53+
54+
- name: Add MTFG OFS Lua Extension
55+
shell: bash -l {0}
56+
run: |
57+
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/OFS/main.lua"
58+
59+
- name: Add json Lua Extension
60+
shell: bash -l {0}
61+
run: |
62+
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json.lua"
63+
4664
- name: Create Asset Archive
4765
uses: vimtor/action-zip@v1
4866
with:
4967
files: dist/funscript-editor
5068
recursive: true
5169
dest: funscript-editor_${{ github.sha }}.zip
70+
5271
- uses: actions/upload-artifact@v2
5372
with:
5473
name: funscript-editor_${{ github.sha }}.zip

.github/workflows/release_windows_application.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,35 @@ jobs:
1313
matrix:
1414
os: ["windows-latest"]
1515
steps:
16+
1617
- name: Checkout Repository
1718
uses: actions/checkout@v2
19+
1820
- name: Setup Miniconda
1921
uses: conda-incubator/setup-miniconda@v2
2022
with:
2123
activate-environment: build
2224
environment-file: environment_windows.yaml
2325
python-version: 3.9
2426
auto-activate-base: false
27+
2528
- name: Collect Conda Info
2629
shell: bash -l {0}
2730
run: |
2831
conda info
2932
conda env export
33+
3034
- name: Get Application Version
3135
id: get_version
3236
uses: battila7/get-version-action@v2
37+
3338
- name: Build Application Documentation
3439
shell: bash -l {0}
3540
run: |
3641
cd docs/app
3742
mkdocs build
3843
cd ../..
44+
3945
- name: Build Application
4046
shell: bash -l {0}
4147
run: |
@@ -44,20 +50,34 @@ jobs:
4450
shell: bash -l {0}
4551
run: |
4652
mv "docs/app/site" "dist/funscript-editor/funscript_editor/docs"
47-
- name: Add MTFG OFS Extension
53+
54+
- name: Create OFS Files Directory
55+
shell: bash -l {0}
56+
run: |
57+
mkdir -p "dist/funscript-editor/OFS"
58+
59+
- name: Add MTFG OFS Lua Extension
60+
shell: bash -l {0}
61+
run: |
62+
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/OFS/main.lua"
63+
64+
- name: Add json Lua Extension
4865
shell: bash -l {0}
4966
run: |
50-
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/main.lua"
67+
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json.lua"
68+
5169
- name: Add Version to Build
5270
shell: bash -l {0}
5371
run: |
5472
echo "${{ steps.get_version.outputs.version }}" > dist/funscript-editor/funscript_editor/VERSION.txt
73+
5574
- name: Create Asset Archive
5675
uses: vimtor/action-zip@v1
5776
with:
5877
files: dist/funscript-editor
5978
recursive: true
6079
dest: funscript-editor_${{ steps.get_version.outputs.version }}.zip
80+
6181
- name: Upload Windows Build Asset
6282
uses: svenstaro/upload-release-action@v2
6383
with:

assets/install.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"minRequiredVersion": "0.1.0"
3+
}

0 commit comments

Comments
 (0)