mirror of
https://github.com/kiwix/kiwix-build.git
synced 2025-09-22 11:56:21 -04:00
Merge pull request #581 from kiwix/mainref
Additional master to main fixes
This commit is contained in:
commit
be486cea4f
6
.github/scripts/common.py
vendored
6
.github/scripts/common.py
vendored
@ -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 = 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
|
||||
else:
|
||||
DEV_BRANCH = None
|
||||
@ -455,7 +455,7 @@ def fix_macos_rpath(project):
|
||||
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
|
||||
|
||||
repo: {user}/{repo} format
|
||||
@ -491,7 +491,7 @@ def trigger_docker_publish(target):
|
||||
"kiwix-tools": "kiwix/kiwix-tools"}.get(target)
|
||||
|
||||
try:
|
||||
trigger_workflow(repo, workflow="docker.yml", ref="master",
|
||||
trigger_workflow(repo, workflow="docker.yml", ref="main",
|
||||
inputs={"version": version})
|
||||
print_message("triggered docker workflow on {repo}", repo=repo)
|
||||
except Exception as exc:
|
||||
|
Loading…
x
Reference in New Issue
Block a user