Skip to content

Commit 6eeff3f

Browse files
authored
Fix windows issues (#726)
Fix for #699 and #723 Install `flet[all]==0.26.0` In the build workflow directly after the requirements.txt. This might also resolve the issue for the flatpak issue (#722)
2 parents 8ed3599 + d099811 commit 6eeff3f

File tree

7 files changed

+353
-263
lines changed

7 files changed

+353
-263
lines changed

.github/workflows/build-release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: ['ubuntu-20.04', 'ubuntu-latest']
15+
os: ['ubuntu-latest']
1616
steps:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-python@v4
1919
with:
2020
python-version: 3.11
2121
- run: pip install -r requirements.txt
22+
- run: pip install --no-cache-dir flet[all]==0.26.0
2223
- run: python scripts/download-tools.py
2324
- run: pip install black ruff pytest pytest-cov pytest-mock pytest-subprocess
2425
- run: black .
@@ -31,13 +32,14 @@ jobs:
3132
strategy:
3233
fail-fast: false
3334
matrix:
34-
os: ['ubuntu-20.04', 'ubuntu-latest', 'macos-latest']
35+
os: ['ubuntu-latest', 'macos-latest']
3536
steps:
3637
- uses: actions/checkout@v4
3738
- uses: actions/setup-python@v4
3839
with:
3940
python-version: 3.11
4041
- run: pip install -r requirements.txt
42+
- run: pip install --no-cache-dir flet[all]==0.26.0
4143
- run: python scripts/download-tools.py
4244
- run: python scripts/build.py
4345
- uses: actions/upload-artifact@v4
@@ -54,6 +56,7 @@ jobs:
5456
with:
5557
python-version: 3.11
5658
- run: pip install -r requirements.txt
59+
- run: pip install --no-cache-dir flet[all]==0.26.0
5760
- run: python scripts/download-tools.py
5861
- run: python scripts/build.py
5962
- uses: actions/upload-artifact@v4
@@ -75,9 +78,6 @@ jobs:
7578
- uses: montudor/action-zip@v1
7679
with:
7780
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-macos-latest.zip openandroidinstaller-${{ github.ref_name }}-macos-latest
78-
- uses: montudor/action-zip@v1
79-
with:
80-
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04.zip openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04
8181
- uses: montudor/action-zip@v1
8282
with:
8383
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-ubuntu-latest.zip openandroidinstaller-${{ github.ref_name }}-ubuntu-latest
@@ -95,6 +95,5 @@ jobs:
9595
title: Release ${{ github.ref_name }}
9696
files: |
9797
openandroidinstaller-${{ github.ref_name }}-macos-latest.zip
98-
openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04.zip
9998
openandroidinstaller-${{ github.ref_name }}-ubuntu-latest.zip
10099
openandroidinstaller-${{ github.ref_name }}-windows-latest.zip

.github/workflows/manual-build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: ['ubuntu-20.04', 'ubuntu-latest', 'macos-latest']
13+
os: ['ubuntu-latest', 'macos-latest']
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-python@v4
1717
with:
1818
python-version: 3.11
1919
- run: pip install -r requirements.txt
20+
- run: pip install --no-cache-dir flet[all]==0.26.0
2021
- run: python scripts/download-tools.py
2122
- run: python scripts/build.py
2223
- uses: actions/upload-artifact@v4
@@ -32,6 +33,7 @@ jobs:
3233
with:
3334
python-version: 3.11
3435
- run: pip install -r requirements.txt
36+
- run: pip install --no-cache-dir flet[all]==0.26.0
3537
- run: python scripts/download-tools.py
3638
- run: python scripts/build.py
3739
- uses: actions/upload-artifact@v4
@@ -53,9 +55,6 @@ jobs:
5355
- uses: montudor/action-zip@v1
5456
with:
5557
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-macos-latest.zip openandroidinstaller-${{ github.ref_name }}-macos-latest
56-
- uses: montudor/action-zip@v1
57-
with:
58-
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04.zip openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04
5958
- uses: montudor/action-zip@v1
6059
with:
6160
args: zip -qq -r openandroidinstaller-${{ github.ref_name }}-ubuntu-latest.zip openandroidinstaller-${{ github.ref_name }}-ubuntu-latest
@@ -73,6 +72,5 @@ jobs:
7372
title: Release ${{ github.ref_name }}
7473
files: |
7574
openandroidinstaller-${{ github.ref_name }}-macos-latest.zip
76-
openandroidinstaller-${{ github.ref_name }}-ubuntu-20.04.zip
7775
openandroidinstaller-${{ github.ref_name }}-ubuntu-latest.zip
7876
openandroidinstaller-${{ github.ref_name }}-windows-latest.zip

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ repos:
2727
# Run the formatter.
2828
- id: ruff-format
2929

30-
- repo: https://github.com/python-poetry/poetry
31-
rev: 1.8.4
32-
hooks:
33-
- id: poetry-check
30+
#- repo: https://github.com/python-poetry/poetry
31+
#rev: 1.8.4
32+
#hooks:
33+
#- id: poetry-check
3434
#- id: poetry-lock
35-
- id: poetry-export
35+
#. id: poetry-export
3636
#- id: poetry-install

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ poetry:
1616
curl -sSL https://install.python-poetry.org | python3 -
1717

1818
install:
19-
rm poetry.lock
2019
rm -rf openandroidinstaller/bin
2120
poetry install --with dev
2221
poetry run python scripts/download-tools.py

0 commit comments

Comments
 (0)