Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions 51.18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,11 @@ kron4ek-wine-10.13-staging-tkg-amd64:
Sub-category: wine
Channel: stable
Date: '1755385726'
kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385757'
kron4ek-wine-proton-10.0-2-amd64:
Category: runners
Sub-category: wine
Expand Down
48 changes: 46 additions & 2 deletions 51.22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,21 @@ vaniglia-21.1.0-cx:

# ./input_files/10-GE-Proton.yml
# -----------------------
ge-proton10-13:
Category: runners
Sub-category: proton
Channel: stable
Date: '1755924171'
ge-proton10-12:
Category: runners
Sub-category: proton
Channel: stable
Date: '1755039786'
ge-proton10-11:
Category: runners
Sub-category: proton
Channel: stable
Date: '1754876344'
ge-proton10-10:
Category: runners
Sub-category: proton
Expand Down Expand Up @@ -1113,6 +1128,31 @@ ge-proton7-4:

# ./input_files/11-kron4ek.yml
# -----------------------
kron4ek-wine-10.13-amd64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385700'
kron4ek-wine-10.13-staging-amd64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385709'
kron4ek-wine-10.13-staging-tkg-amd64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385726'
kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385757'
kron4ek-wine-proton-10.0-2-amd64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1753975920'
kron4ek-wine-10.12-amd64:
Category: runners
Sub-category: wine
Expand Down Expand Up @@ -2445,10 +2485,10 @@ kron4ek-wine-6.3-proton-experimental-1b31393-amd64:

# ./input_files/13-vkd3d-proton.yml
# -----------------------
vkd3d-proton-2.14.1-11-3a36428:
vkd3d-proton-2.14.1-13-c5cf288:
Category: vkd3d
Channel: unstable
Date: '1751379826'
Date: '1755013705'
vkd3d-proton-2.14.1:
Category: vkd3d
Channel: stable
Expand Down Expand Up @@ -2498,6 +2538,10 @@ vkd3d-proton-2.5:

# ./input_files/14-dxvk.yml
# -----------------------
dxvk-2.7-3-402c290:
Category: dxvk
Channel: unstable
Date: '1756039649'
dxvk-2.7:
Category: dxvk
Channel: stable
Expand Down
22 changes: 10 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ To propose new components, it is necessary to open a [Pull Request](https://gith

To do it, there is currently two methods.

### 1 - Add an entry to the CI (prefered method)
### 1 - Add an entry to the CI (preferred method)
For most components, new stable versions (and experimental builds if they exist) are automatically pulled. This is accomplished by the [pull-components.yml](https://github.com/bottlesdevs/components/blob/main/.github/workflows/pull-components.yml) workflow, where components are described in the following format:

```yaml
Expand All @@ -31,13 +31,13 @@ Sub-category: "",
```
where:
- **repo** is the GitHub repository in the format `owner/repository`
- **workflow** is the workflow filename used to generate exerimental builds, if any
- **branch** is the **workflow** branch used to generate exerimental builds, if any
- **name-prefix** is used to generate the full name of the component using **name-prefix** + `version` + **name-suffix** (e.g. `dxvk-` + `2.0` + ∅), and look for release/experimental asset whose filename is begining by **name-prefix**
- **name-suffix** serves the exact same purpose as **name-prefix**, is only used when multiple variants are available for one component (e.g. `-x86`, `-x64`, etc)
- **version-prefix** is used to find the latest release version whose [tag](https://github.com/doitsujin/dxvk/tags) is begining by **version-prefix**, and to remove **version-prefix** from the final `version` string (e.g. `v2.0` will become `2.0`)
- **workflow** is the workflow filename used to generate experimental builds, if any
- **branch** is the **workflow** branch used to generate experimental builds, if any
- **name-prefix** is used to generate the full name of the component using **name-prefix** + `version` + **name-suffix** (e.g. `dxvk-` + `2.0` + ∅), and look for release/experimental asset whose filename is beginning by **name-prefix**
- **name-suffix** serves the exact same purpose as **name-prefix**, is only used when multiple variants are available for one component (e.g. `-x86`, `-x64`, etc.)
- **version-prefix** is used to find the latest release version whose [tag](https://github.com/doitsujin/dxvk/tags) is beginning by **version-prefix**, and to remove **version-prefix** from the final `version` string (e.g. `v2.0` will become `2.0`)
- **yaml-file** is the YAML component filename located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory
- **Category** and **Sub-category** are repectively the Category and Sub-category as described in the **yaml-file** (e.g. [14-dxvk.yml](https://github.com/bottlesdevs/components/blob/main/input_files/14-dxvk.yml))
- **Category** and **Sub-category** are respectively the Category and Sub-category as described in the **yaml-file** (e.g. [14-dxvk.yml](https://github.com/bottlesdevs/components/blob/main/input_files/14-dxvk.yml))

### 2 - Manually (legacy method)
Each poster must follow the following layout:
Expand All @@ -51,9 +51,7 @@ File:
file_checksum: 659ee0ee3dbe5274825734ad19692e12
rename: caffe-7.2-x86_64.tar.xz
```
old json manifests can be converted using this [online tool](https://www.json2yaml.com).

where:
Old JSON manifests can be converted using this [online tool](https://www.json2yaml.com), where:
- **Name** is a name without spaces, including version, of the component (must reflect the name of the manifest file)
- **Provider** is the name of the component supplier (not the maintainer)
- **Channel** should be stable or unstable
Expand All @@ -74,9 +72,9 @@ Post:

We provide an [automatic tools](https://github.com/bottlesdevs/tools/blob/main/MaintainersHelpers/component-generator.py) for generating the manifest.

In addition to the manifest, en entry must be created in the corresponding file located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory. The index can then be regenerated using the [generate_index.sh](https://github.com/bottlesdevs/components/blob/main/generate_index.sh) script.
In addition to the manifest, an entry must be created in the corresponding file located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory. The index can then be regenerated using the [generate_index.sh](https://github.com/bottlesdevs/components/blob/main/generate_index.sh) script.

Please double check and test using the `LOCAL_COMPONENTS=/path/to/components flatpak run com.usebottles.bottles` command before open a pull request.
Please double-check and test using the `LOCAL_COMPONENTS=/path/to/components flatpak run com.usebottles.bottles` command before open a pull request.

### Guidelines
The sources of the components must be public and searchable and must not infringe any copyright. Also, each archive must contain the compiled version and not the source code.
Expand Down
5 changes: 5 additions & 0 deletions index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,11 @@ kron4ek-wine-10.13-staging-tkg-amd64:
Sub-category: wine
Channel: stable
Date: '1755385726'
kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385757'
kron4ek-wine-proton-10.0-2-amd64:
Category: runners
Sub-category: wine
Expand Down
5 changes: 5 additions & 0 deletions input_files/11-kron4ek.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ kron4ek-wine-10.13-staging-tkg-amd64:
Sub-category: wine
Channel: stable
Date: '1755385726'
kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64:
Category: runners
Sub-category: wine
Channel: stable
Date: '1755385757'
kron4ek-wine-proton-10.0-2-amd64:
Category: runners
Sub-category: wine
Expand Down
14 changes: 14 additions & 0 deletions runners/wine/kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Name: kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64
Provider: Kron4ek
Maintainer: CI
Channel: stable
File:
- file_name: wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz
url: https://github.com/Kron4ek/Wine-Builds/releases/download/10.13/wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz
file_checksum: bcc72565d0224e0901a8ad20fc86c147
file_size: 71923932
rename: wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz
Post:
- action: rename
source: wine-10.13-staging-tkg-ntsync-amd64-wow64
dest: kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64