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.

Sign up for GitHub

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

Jump to bottom

fix: MangoHud, gamescope and vkBasalt versions #3112

Merged
merged 6 commits into from
Dec 1, 2023
Merged

fix: MangoHud, gamescope and vkBasalt versions #3112

merged 6 commits into from
Dec 1, 2023

Conversation

koplo199
Copy link
Contributor

@koplo199 koplo199 commented Oct 1, 2023 •
edited
Loading

It will not work if the versions don't match.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 1, 2023 •
edited
Loading

Pylint result on modfied files: 
************* Module bottles.frontend.views.bottle_preferences
bottles/frontend/views/bottle_preferences.py:1:0: C0302: Too many lines in module (1129/1000) (too-many-lines)
bottles/frontend/views/bottle_preferences.py:444:13: W0511: "vista": "Windows Vista", # TODO: implement this in the backend (fixme)
bottles/frontend/views/bottle_preferences.py:55:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:57:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:146:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:147:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:148:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:149:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:150:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:152:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:153:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:154:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:155:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:156:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:157:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:158:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:159:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:160:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:161:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:162:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:163:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:164:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:165:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:166:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:167:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:168:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:169:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:180:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:184:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:23:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/views/bottle_preferences.py:172:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:177:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:186:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:276:8: W0212: Access to a protected member __library of a client class (protected-access)
bottles/frontend/views/bottle_preferences.py:289:25: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:348:12: W0612: Unused variable 'index' (unused-variable)
bottles/frontend/views/bottle_preferences.py:529:40: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:536:39: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:543:34: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:561:48: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:568:38: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:575:28: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:582:43: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:590:38: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:618:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:627:30: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:636:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:645:27: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:654:29: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:674:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:683:33: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:692:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:701:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:710:37: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:719:36: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:728:46: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:758:39: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:767:43: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:776:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:805:41: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:844:0: W0613: Unused argument 'args' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1018:19: W0613: Unused argument 'result' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1018:27: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1055:40: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1064:30: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1064:43: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1076:31: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1076:44: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1088:31: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1088:44: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1105:37: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1105:50: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1118:17: R1719: The if expression can be replaced with 'not test' (simplifiable-if-expression)
bottles/frontend/views/bottle_preferences.py:276:8: W0238: Unused private member `PreferencesView.__library` (unused-private-member)
bottles/frontend/views/bottle_preferences.py:251:16: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:254:8: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:260:12: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:437:8: W0201: Attribute 'windows_versions' defined outside __init__ (attribute-defined-outside-init)
************* Module bottles.backend.globals
bottles/backend/globals.py:88:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/globals.py:88:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/globals.py:89:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/globals.py:89:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/globals.py:26:0: R0903: Too few public methods (1/2) (too-few-public-methods)
bottles/backend/globals.py:64:0: R0903: Too few public methods (0/2) (too-few-public-methods)
bottles/backend/globals.py:78:0: C0103: Constant name "vkbasalt_available" doesn't conform to UPPER_CASE naming style (invalid-name)
bottles/backend/globals.py:82:0: C0103: Constant name "base_version" doesn't conform to UPPER_CASE naming style (invalid-name)
bottles/backend/globals.py:84:29: R1732: Consider using 'with' for resource-allocating operations (consider-using-with)
bottles/backend/globals.py:84:29: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/globals.py:23:0: W0611: Unused yaml imported from bottles.backend.utils (unused-import)

@koplo199 koplo199 marked this pull request as draft October 1, 2023 18:30
@koplo199 koplo199 changed the title fix: MangoHud and vkBasalt fix: MangoHud and vkBasalt version Oct 1, 2023
@koplo199 koplo199 changed the title fix: MangoHud and vkBasalt version fix: MangoHud and vkBasalt versions Oct 1, 2023
@koplo199 koplo199 changed the title fix: MangoHud and vkBasalt versions fix: MangoHud, gamescope and vkBasalt versions Oct 1, 2023
@koplo199 koplo199 marked this pull request as ready for review October 1, 2023 20:06
@koplo199 koplo199 mentioned this pull request Oct 1, 2023
Closed
@orowith2os
Copy link
Contributor

I believe we can actually extract the runtime version from /etc/os-release and list that here, so it's always accurate.

@koplo199
Copy link
Contributor Author

koplo199 commented Oct 2, 2023 •
edited
Loading

I believe we can actually extract the runtime version from /etc/os-release and list that here, so it's always accurate.

Unfortunately, only the GNOME runtime version is shown in /etc/os-release. There is /app/manifest.json from which we could extract the base-version, but I don't know if it would be accurate.

Edit: hardcoding it wouldn't be accurate either, so it's probably our best bet. I implemented it in the last commit.

@koplo199 koplo199 force-pushed the bottlesdevs-pr branch 3 times, most recently from dc6301b to dbced4f Compare October 2, 2023 14:39
@fab-sonarqube
Copy link

fab-sonarqube bot commented Oct 3, 2023

SonarQube Quality Gate

Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@orowith2os
Copy link
Contributor

Well, I fucked up on the /app/manifest.json shenanigans. It looks like our test env doesn't contain it, so it fails. Maybe spoofing it would work.

@koplo199
Copy link
Contributor Author

@orowith2os Yes, I originally did in 90ee77d what you were suggesting, but had to add that condition in 3717f01 to fix the CI from failing, for the better in my opinion.

@koplo199 koplo199 mentioned this pull request Nov 30, 2023
Merged
@fab-sonarqube Fab-SonarQube
Copy link

fab-sonarqube bot commented Nov 30, 2023

SonarQube Quality Gate

Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@mirkobrombin mirkobrombin merged commit 9304cf4 into bottlesdevs:main Dec 1, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orowith2os orowith2os orowith2os left review comments

@mirkobrombin mirkobrombin mirkobrombin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@koplo199 @orowith2os @mirkobrombin