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

Merge pull request #581 from kiwix/mainref 

Additional master to main fixes
This commit is contained in:
Kelson 2023-03-28 11:05:26 +02:00 committed by GitHub
parent 61fb624f66 7c02c6b778
commit be486cea4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ _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') MAKE_RELEASE = MAKE_RELEASE and (_environ.get('GITHUB_EVENT_NAME') != 'schedule')
if not MAKE_RELEASE and _ref != "master": if not MAKE_RELEASE and _ref != "main":
DEV_BRANCH = _ref DEV_BRANCH = _ref
else: else:
DEV_BRANCH = None DEV_BRANCH = None
@ -455,7 +455,7 @@ def fix_macos_rpath(project):
subprocess.check_call(command, env=os.environ) subprocess.check_call(command, env=os.environ)
def trigger_workflow(repo, workflow="docker.yml", ref="master", inputs=None): def trigger_workflow(repo, workflow="docker.yml", ref="main", inputs=None):
"""triggers a `workflow_dispatch` event to the specified workflow on its repo """triggers a `workflow_dispatch` event to the specified workflow on its repo
repo: {user}/{repo} format repo: {user}/{repo} format
@ -491,7 +491,7 @@ def trigger_docker_publish(target):
"kiwix-tools": "kiwix/kiwix-tools"}.get(target) "kiwix-tools": "kiwix/kiwix-tools"}.get(target)
try: try:
trigger_workflow(repo, workflow="docker.yml", ref="master", trigger_workflow(repo, workflow="docker.yml", ref="main",
inputs={"version": version}) inputs={"version": version})
print_message("triggered docker workflow on {repo}", repo=repo) print_message("triggered docker workflow on {repo}", repo=repo)
except Exception as exc: except Exception as exc: