mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-22 02:32:33 +01:00
[workflows:executables] change dev/linux binary name to …_linux
This reverts commit 05f8435e09
.
This commit is contained in:
parent
e35317118a
commit
3d033a48ea
2
.github/workflows/executables.yml
vendored
2
.github/workflows/executables.yml
vendored
@ -71,7 +71,7 @@ jobs:
|
|||||||
- name: Build executable
|
- name: Build executable
|
||||||
run: |
|
run: |
|
||||||
pip install requests requests[socks] yt-dlp pyyaml ${{ matrix.python-packages }} pyinstaller
|
pip install requests requests[socks] yt-dlp pyyaml ${{ matrix.python-packages }} pyinstaller
|
||||||
python ./scripts/pyinstaller.py --os '${{ matrix.os }}' --arch '${{ matrix.architecture }}'
|
python ./scripts/pyinstaller.py --label '${{ env.LABEL }}'
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
@ -31,7 +31,7 @@ BINARIES_DEV = {
|
|||||||
"windows" : "gallery-dl_windows.exe",
|
"windows" : "gallery-dl_windows.exe",
|
||||||
"windows_x86": "gallery-dl_windows_x86.exe",
|
"windows_x86": "gallery-dl_windows_x86.exe",
|
||||||
"windows_x64": "gallery-dl_windows.exe",
|
"windows_x64": "gallery-dl_windows.exe",
|
||||||
"linux" : "gallery-dl_ubuntu",
|
"linux" : "gallery-dl_linux",
|
||||||
"macos" : "gallery-dl_macos",
|
"macos" : "gallery-dl_macos",
|
||||||
}
|
}
|
||||||
BINARIES = {
|
BINARIES = {
|
||||||
@ -204,8 +204,15 @@ class UpdateExtractor(Extractor):
|
|||||||
data["_check"] = check
|
data["_check"] = check
|
||||||
data["_exact"] = exact
|
data["_exact"] = exact
|
||||||
|
|
||||||
|
if binary == "linux" and \
|
||||||
|
repo != "stable" and \
|
||||||
|
data["tag_name"] <= "2024.05.28":
|
||||||
|
binary_name = "gallery-dl_ubuntu"
|
||||||
|
else:
|
||||||
|
binary_name = BINARIES[repo][binary]
|
||||||
|
|
||||||
url = "{}/{}/releases/download/{}/{}".format(
|
url = "{}/{}/releases/download/{}/{}".format(
|
||||||
self.root, path_repo, data["tag_name"], BINARIES[repo][binary])
|
self.root, path_repo, data["tag_name"], binary_name)
|
||||||
|
|
||||||
yield Message.Directory, data
|
yield Message.Directory, data
|
||||||
yield Message.Url, url, data
|
yield Message.Url, url, data
|
||||||
|
@ -22,12 +22,15 @@ def main():
|
|||||||
else:
|
else:
|
||||||
label = ""
|
label = ""
|
||||||
if args.os:
|
if args.os:
|
||||||
label += args.os.partition("-")[0].lower()
|
os = args.os.partition("-")[0].lower()
|
||||||
|
if os == "ubuntu":
|
||||||
|
os = "linux"
|
||||||
|
label += os
|
||||||
if args.arch == "x86":
|
if args.arch == "x86":
|
||||||
label += "_x86"
|
label += "_x86"
|
||||||
|
|
||||||
if args.print:
|
if args.print:
|
||||||
return print(label.replace("ubuntu", "linux"))
|
return print(label)
|
||||||
|
|
||||||
name = "gallery-dl"
|
name = "gallery-dl"
|
||||||
if label:
|
if label:
|
||||||
|
Loading…
Reference in New Issue
Block a user