smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make release only if we are running the workflow on a `r_xx` tag. 

Also check that we are not a scheduled workflow
(But it is more a double check. This shloud not happen)
This commit is contained in:
Matthieu Gautier 2022-09-28 15:09:53 +02:00
parent 754b716a23
commit f7706428a2
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.github/scripts/build_release_nightly.py vendored
View File

@ -18,15 +18,10 @@ from common import (
OS_NAME, OS_NAME,
PLATFORM_TARGET, PLATFORM_TARGET,
DESKTOP, DESKTOP,
MAKE_RELEASE,
notarize_macos_build, notarize_macos_build,
) )
if os.environ.get('GITHUB_EVENT_NAME') == 'schedule':
RELEASE = False
else:
RELEASE = True
if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"): if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
TARGETS = ("libzim", "libkiwix") TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"): elif PLATFORM_TARGET.startswith("native_"):
@ -47,34 +42,34 @@ else:
TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools") TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
# Filter what to build if we are doing a release. # Filter what to build if we are doing a release.
if RELEASE: if MAKE_RELEASE:
def release_filter(project): def release_filter(project):
return release_versions.get(project) is not None return release_versions.get(project) is not None
TARGETS = tuple(filter(release_filter, TARGETS)) TARGETS = tuple(filter(release_filter, TARGETS))
for target in TARGETS: for target in TARGETS:
run_kiwix_build(target, platform=PLATFORM_TARGET, make_release=RELEASE) run_kiwix_build(target, platform=PLATFORM_TARGET, make_release=MAKE_RELEASE)
if target == "kiwix-desktop": if target == "kiwix-desktop":
archive = create_desktop_image(make_release=RELEASE) archive = create_desktop_image(make_release=MAKE_RELEASE)
else: else:
if PLATFORM_TARGET == "native_mixed" and OS_NAME == "osx": if PLATFORM_TARGET == "native_mixed" and OS_NAME == "osx":
fix_macos_rpath(target) fix_macos_rpath(target)
notarize_macos_build(target) notarize_macos_build(target)
archive = make_archive(target, make_release=RELEASE) archive = make_archive(target, make_release=MAKE_RELEASE)
if archive: if archive:
upload_archive(archive, target, make_release=RELEASE) upload_archive(archive, target, make_release=MAKE_RELEASE)
if RELEASE and target in ("zim-tools", "kiwix-tools"): if MAKE_RELEASE and target in ("zim-tools", "kiwix-tools"):
trigger_docker_publish(target) trigger_docker_publish(target)
# We have few more things to do for release: # We have few more things to do for release:
if RELEASE: if MAKE_RELEASE:
# Publish source archives # Publish source archives
if PLATFORM_TARGET in ("native_dyn", "native_mixed") and OS_NAME != "osx": if PLATFORM_TARGET in ("native_dyn", "native_mixed") and OS_NAME != "osx":
for target in TARGETS: for target in TARGETS:
if release_versions.get(target) != 0: if release_versions.get(target) != 0:
continue continue
run_kiwix_build( run_kiwix_build(
target, platform=PLATFORM_TARGET, make_release=RELEASE, make_dist=True target, platform=PLATFORM_TARGET, make_release=MAKE_RELEASE, make_dist=True
) )
full_target_name = "{}-{}".format(target, main_project_versions[target]) full_target_name = "{}-{}".format(target, main_project_versions[target])
if target == "kiwix-desktop": if target == "kiwix-desktop":
@ -88,7 +83,7 @@ if RELEASE:
/ "meson-dist" / "meson-dist"
/ "{}.tar.xz".format(full_target_name) / "{}.tar.xz".format(full_target_name)
) )
upload_archive(archive, target, make_release=RELEASE) upload_archive(archive, target, make_release=MAKE_RELEASE)
# Publish flathub # Publish flathub
if PLATFORM_TARGET == "flatpak" and "kiwix-desktop" in TARGETS: if PLATFORM_TARGET == "flatpak" and "kiwix-desktop" in TARGETS:

1
.github/scripts/common.py vendored
View File

@ -37,6 +37,7 @@ KIWIX_DESKTOP_ONLY = False
_ref = _environ.get("GITHUB_REF", "").split("/")[-1] _ref = _environ.get("GITHUB_REF", "").split("/")[-1]
MAKE_RELEASE = re.fullmatch(r"r_[0-9]+", _ref) is not None MAKE_RELEASE = re.fullmatch(r"r_[0-9]+", _ref) is not None
MAKE_RELEASE = MAKE_RELEASE and (_environ.get('GITHUB_EVENT_NAME') != 'schedule')
RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux" RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux"