Skip to content

Commit

Permalink
Fix dist suffixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Willy-JL committed Mar 10, 2024
1 parent ed08b19 commit ef557bc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflow_data/webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
desc = desc.rsplit("\n", 1)[0] + f"\n+ {count - i} more commits"
break
url = event["compare"]
color = 16723712 if event["forced"] else 3669797
color = 16723712 if event["forced"] else 11761899

case "release":
webhook = "RELEASE_WEBHOOK"
Expand Down
3 changes: 1 addition & 2 deletions scripts/get_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@ def get_details(event, args):
data["commit_sha"] = data["commit_hash"][:8]
data["branch_name"] = re.sub("refs/\w+/", "", ref)
data["suffix"] = (
"mntm-" +
data["branch_name"].replace("/", "_")
+ "-"
+ current_time.strftime("%d%m%Y")
+ "-"
+ data["commit_sha"]
)
if ref.startswith("refs/tags/"):
Expand Down
8 changes: 4 additions & 4 deletions site_scons/environ.scons
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ coreenv = VAR_ENV.Clone(
)

# If DIST_SUFFIX is set in environment, is has precedence (set by CI)
# if os_suffix := os.environ.get("DIST_SUFFIX", None):
# coreenv.Replace(
# DIST_SUFFIX=os_suffix,
# )
if os_suffix := os.environ.get("DIST_SUFFIX", None):
coreenv.Replace(
DIST_SUFFIX=os_suffix,
)

# Default value for commandline options

Expand Down

0 comments on commit ef557bc

Please sign in to comment.