Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

51.10 #3099

Merged
merged 20 commits into from
Dec 23, 2023
Merged

51.10 #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a6e6806
Update runtimes
koplo199 Sep 27, 2023
3c62fc6
51.10
koplo199 Sep 27, 2023
79f024c
Update manifest automation to reflect new Python runtime version
koplo199 Sep 27, 2023
e249be3
manifest: Mark more modules as important
koplo199 Sep 27, 2023
693ec34
:robot:: Update manifest (important) (#17)
github-actions[bot] Sep 27, 2023
5a09203
manifest: Workaround to build gamemode in the new Gnome 45 runtime
koplo199 Sep 27, 2023
3270741
manifest: Use updated backend build option for libflatpak
koplo199 Sep 27, 2023
86bb53d
Update com.usebottles.bottles.yml
koplo199 Oct 3, 2023
60d4055
When running update-manifest workflow manually, do not require import…
koplo199 Oct 3, 2023
94ed6bf
:robot:: Update manifest (important) (#18)
github-actions[bot] Oct 3, 2023
7c034d3
automatiion: Update step name
koplo199 Oct 3, 2023
3bdfcfe
Update com.usebottles.bottles.metainfo.xml.in
koplo199 Oct 3, 2023
3970946
:robot:: Update manifest (important) (#21)
github-actions[bot] Dec 1, 2023
a057d36
Update 2 modules (#23)
github-actions[bot] Dec 6, 2023
4bdd670
Remove gamemode patch
koplo199 Dec 6, 2023
a734078
Update 2 modules (#25)
github-actions[bot] Dec 12, 2023
cd9877e
:robot:: Update manifest (important) (#27)
github-actions[bot] Dec 23, 2023
3cbf906
build(deps): bump actions/upload-artifact from 3 to 4 (#26)
dependabot[bot] Dec 23, 2023
b80af13
build(deps): bump actions/setup-python from 4 to 5 (#22)
dependabot[bot] Dec 23, 2023
c997095
build(deps): bump actions/github-script from 6.4.1 to 7.0.1 (#20)
dependabot[bot] Dec 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install Ubuntu dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pylint-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install Ubuntu dependencies
Expand All @@ -31,7 +31,7 @@ jobs:
python3 utils/pylint-parser.py > output/pylint-result
cat output/pylint-result
echo ${{ github.event.number }} > output/pr-number
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: pylint-result
path: output/
2 changes: 1 addition & 1 deletion .github/workflows/pylint-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
github.event.workflow_run.conclusion == 'success'
steps:
- name: 'Download artifact'
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
with:
script: |
var artifacts = await github.rest.actions.listWorkflowRunArtifacts ({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install Ubuntu dependencies
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/update-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:

env:
PR_BRANCH: pr/ci-manifest/${{ github.ref_name }}
FEDC_ARGS: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml"

jobs:
update-manifest:
Expand All @@ -20,7 +21,7 @@ jobs:
path: "bottles-repository"
ref: ${{ github.ref_name }}

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
cache: 'pip'
Expand All @@ -35,14 +36,20 @@ jobs:
git config user.name "github-actions[bot]"
pur -r requirements.txt
pur -r requirements.dev.txt
req2flatpak --requirements-file requirements.txt --yaml --target-platforms 310-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
req2flatpak --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
git diff ${{ github.ref_name }} --exit-code requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml
updated=$?
if [ $updated -ne 0 ]; then
git add requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml
git commit -m "Update PyPI dependencies"
fi

- name: Update arguments
if: github.event_name == 'workflow_dispatch'
run: |
remove_important_update_only=$(sed 's/--require-important-update//g' <<< '${{ env.FEDC_ARGS }}')
echo "FEDC_ARGS=$remove_important_update_only" >> $GITHUB_ENV

- uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
env:
GIT_AUTHOR_NAME: github-actions[bot]
Expand All @@ -52,7 +59,7 @@ jobs:
EMAIL: github-actions[bot]@users.noreply.github.com
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml"
args: ${{ env.FEDC_ARGS }}

- name: Create PR if necessary
working-directory: "bottles-repository"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
51.9
51.10
34 changes: 17 additions & 17 deletions com.usebottles.bottles.pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 310-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
name: python3-package-installation
buildsystem: simple
build-commands:
Expand All @@ -14,11 +14,11 @@ sources:
url: https://files.pythonhosted.org/packages/1a/b5/228c1cdcfe138f1a8e01ab1b54284c8b83735476cb22b6ba251656ed13ad/Markdown-3.4.4-py3-none-any.whl
sha256: a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941
- type: file
url: https://files.pythonhosted.org/packages/44/80/96d6317a15a13a4f80ffa61118dc144a70756135fbc6ace30f9b033f51f7/PyGObject-3.44.1.tar.gz
sha256: 665fbe980c91e8b31ad78ed3f66879946948200864002d193f67eccc1d7d5d83
url: https://files.pythonhosted.org/packages/ac/4a/f24ddf1d20cc4b56affc7921e29928559a06c922eb60077448392792b914/PyGObject-3.46.0.tar.gz
sha256: 481437b05af0a66b7c366ea052710eb3aacbb979d22d30b797f7ec29347ab1e6
- type: file
url: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515
url: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673
only-arches:
- x86_64
- type: file
Expand All @@ -28,8 +28,8 @@ sources:
url: https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl
sha256: e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
- type: file
url: https://files.pythonhosted.org/packages/a4/65/057bf29660aae6ade0816457f8db4e749e5c0bfa2366eb5f67db9912fa4c/charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad
url: https://files.pythonhosted.org/packages/ff/b6/9222090f396f33cd58aa5b08b9bbf8871416b746a0c7b412a41a973674a5/charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293
only-arches:
- x86_64
- type: file
Expand All @@ -39,31 +39,31 @@ sources:
url: https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl
sha256: 90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
- type: file
url: https://files.pythonhosted.org/packages/34/7a/9ec6142fdab1749eacbab23c8a502cccb57f1985d764a5cfacad1d55a2de/orjson-3.9.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: f13d61c0c7414ddee1ef4d0f303e2222f8cced5a2e26d9774751aecd72324c9e
url: https://files.pythonhosted.org/packages/0b/e1/2c6e894de23c1bb5c76eff087c99fc3c7ce8f317a793f8c80767f4225733/orjson-3.9.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: e5205ec0dfab1887dd383597012199f5175035e782cdb013c542187d280ca443
only-arches:
- x86_64
- type: file
url: https://files.pythonhosted.org/packages/c8/98/e6c836ea547236fffab67503ff691d302f2366fbe3a1e37bfe611e352b3c/pathvalidate-3.1.0-py3-none-any.whl
sha256: 912fd1d2e1a2a6a6f98da36a91f21ed86746473810ff625b9c34f3d06c0caa1d
url: https://files.pythonhosted.org/packages/0c/ab/673cce13ab635fd755d206b18c0a371ef6e28ddbe25fadba9ae6c59f22a5/pathvalidate-3.2.0-py3-none-any.whl
sha256: cc593caa6299b22b37f228148257997e2fa850eea2daf7e4cc9205cef6908dee
- type: file
url: https://files.pythonhosted.org/packages/43/94/52243ddff508780dd2d8110964320ab4851134a55ab102285b46e740f76a/patool-1.12-py2.py3-none-any.whl
sha256: 3f642549c9a78f5b8bef1af92df385b521d360520d1f34e4dba3fd1dee2a21bc
- type: file
url: https://files.pythonhosted.org/packages/55/26/d0ad8b448476d0a1e8d3ea5622dc77b916db84c6aa3cb1e1c0965af948fc/pefile-2023.2.7-py3-none-any.whl
sha256: da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6
- type: file
url: https://files.pythonhosted.org/packages/a2/dd/bc2c9ee9485308a29c18b1241329e677917af25c60b127857f0fb23d0c6e/pycairo-1.24.0.tar.gz
sha256: 1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6
url: https://files.pythonhosted.org/packages/db/f1/45f288a45215e12dea5a107a2e686e33902701d5485219437b5d64d1080a/pycairo-1.25.0.tar.gz
sha256: 37842b9bfa6339c45a5025f752e1d78d5840b1a0f82303bdd5610846ad8b5c4f
- type: file
url: https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae/pycurl-7.45.2.tar.gz
sha256: 5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca
- type: file
url: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl
sha256: 58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f
- type: file
url: https://files.pythonhosted.org/packages/9b/81/62fd61001fa4b9d0df6e31d47ff49cfa9de4af03adecf339c7bc30656b37/urllib3-2.0.4-py3-none-any.whl
sha256: de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4
url: https://files.pythonhosted.org/packages/26/40/9957270221b6d3e9a3b92fdfba80dd5c9661ff45a664b47edd5d00f707f5/urllib3-2.0.6-py3-none-any.whl
sha256: 7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2
- type: file
url: https://files.pythonhosted.org/packages/28/f5/6955d7b3a5d71ce6bac104f9cf98c1b0513ad656cdaca8ea7d579196f771/wheel-0.41.1-py3-none-any.whl
sha256: 473219bd4cbedc62cea0cb309089b593e47c15c4a2531015f94e4e3b9a0f6981
url: https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl
sha256: 75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8
35 changes: 18 additions & 17 deletions com.usebottles.bottles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ id: com.usebottles.bottles
sdk: org.gnome.Sdk
runtime: org.gnome.Platform
base: org.winehq.Wine
base-version: stable-22.08
runtime-version: &runtime-version '44'
base-version: stable-23.08
runtime-version: &runtime-version '45'
command: bottles

finish-args:
Expand All @@ -16,7 +16,6 @@ finish-args:
- --socket=wayland
- --socket=pulseaudio
- --device=all
- --filesystem=xdg-download
- --system-talk-name=org.freedesktop.UDisks2
- --env=LD_LIBRARY_PATH=/app/lib:/app/lib32
- --env=PATH=/app/bin:/app/utils/bin:/usr/bin:/usr/lib/extensions/vulkan/MangoHud/bin/:/usr/bin:/usr/lib/extensions/vulkan/OBSVkCapture/bin/:/usr/lib/extensions/vulkan/gamescope/bin/
Expand Down Expand Up @@ -100,7 +99,7 @@ modules:
sources:
- type: git
url: https://github.com/hoytech/vmtouch
commit: 8f6898e3c027f445962e223ca7a7b33d40395fc6
commit: af86e27675843b3c7e4ddfee66ddbaf44eff43c4
x-checker-data:
type: json
url: https://api.github.com/repos/hoytech/vmtouch/commits
Expand All @@ -118,8 +117,8 @@ modules:
sources:
- type: git
url: https://github.com/KhronosGroup/Vulkan-Tools.git
tag: sdk-1.3.250.1
commit: 695887a994ef9cc00a7aa3f9c00b31a56ea79534
tag: sdk-1.3.261.1
commit: a7da7027ca9fd0901639f02619c226da9c6036f1
x-checker-data:
type: git
tag-pattern: ^sdk-([\d.]+)$
Expand All @@ -129,8 +128,8 @@ modules:
sources:
- type: git
url: https://github.com/KhronosGroup/Vulkan-Headers.git
tag: sdk-1.3.250.1
commit: 9e61870ecbd32514113b467e0a0c46f60ed222c7
tag: sdk-1.3.261.1
commit: 85c2334e92e215cce34e8e0ed8b2dce4700f4a50
x-checker-data:
type: git
tag-pattern: ^sdk-([\d.]+)$
Expand All @@ -144,8 +143,8 @@ modules:
sources: &gamemode_sources
- type: git
url: https://github.com/FeralInteractive/gamemode
tag: '1.7'
commit: 4dc99dff76218718763a6b07fc1900fa6d1dafd9
tag: 1.8.1
commit: 5180d89e66830d87f69687b95fb86f622552b94b
x-checker-data:
type: git
is-important: true
Expand Down Expand Up @@ -188,8 +187,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
tag: 7.1.1-15
commit: a0a5f3da4cd07919dd2d1bbae121e590b5f105e2
tag: 7.1.1-23
commit: 54b13e91d262b1083e27fc8c02532c89d3ff649c
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
Expand All @@ -198,14 +197,15 @@ modules:
buildsystem: meson
config-opts:
- -Ddocs=false
- -Dbackends=gtk4
- -Dbackend-gtk4=enabled
sources:
- type: git
url: https://github.com/flatpak/libportal
tag: '0.6'
commit: 13df0b887a7eb7b0f9b14069561a41f62e813155
tag: 0.7.1
commit: e9ed3a50cdde321eaf42361212480a66eb94a57a
x-checker-data:
type: git
is-important: true
tag-pattern: ^([\d.]+)$

- name: blueprint-compiler
Expand Down Expand Up @@ -246,6 +246,7 @@ modules:
commit: 6fbeab0470df55aeab141a45763147440b2f0290
x-checker-data:
type: git
is-important: true
tag-pattern: ^([\d.]+)$
modules:
- name: vte
Expand All @@ -256,8 +257,8 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/vte
tag: 0.73.93
commit: f13f4d6cd83ba01315ac62755d70736705c40c99
tag: 0.74.2
commit: 3f66edbf598129bafde3baa91ccfb345056418c3
x-checker-data:
type: git
tag-pattern: ^([\d.]+)$
Expand Down
9 changes: 9 additions & 0 deletions data/com.usebottles.bottles.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
<display_length compare="ge">768</display_length>
</requires>
<releases>
<release version="51.10" date="2023-09-27">
<description translatable="no">
<p>Clean FSR settings</p>
<p>Improve bad connections handling</p>
<p>Update Flatpak runtime</p>
<p>Update translations</p>
<p>Various bug fixes</p>
</description>
</release>
<release version="51.9" date="2023-08-21">
<description translatable="no">
<p>Fix runners and components from not showing when prereleases are off</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(
'bottles',
version: '51.9',
version: '51.10',
meson_version: '>= 0.59.0',
default_options: [
'warning_level=2',
Expand Down
4 changes: 2 additions & 2 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Updated using pur -r requirements.txt
pytest==7.4.0
pytest==7.4.3
requirements-parser==0.5.0
mypy==1.5.1
mypy==1.8.0
types_Markdown
types-PyYAML
types-Pygments
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Updated using pur -r requirements.txt
wheel==0.41.1
wheel==0.42.0
PyYAML==6.0.1
pycurl==7.45.2
chardet==5.2.0
requests[use_chardet_on_py3]==2.31.0
Markdown==3.4.4
Markdown==3.5.1
icoextract==0.1.4
patool==1.12
pathvalidate==3.1.0
patool==2.0.0
pathvalidate==3.2.0
FVS==0.3.4
orjson==3.9.5
pycairo==1.24.0
PyGObject==3.44.1
charset-normalizer==3.2.0
idna==3.4
urllib3==2.0.4
certifi==2023.7.22
orjson==3.9.10
pycairo==1.25.1
PyGObject==3.46.0
charset-normalizer==3.3.2
idna==3.6
urllib3==2.1.0
certifi==2023.11.17
pefile==2023.2.7