Skip to content

Commit

Permalink
Fix workflows
Browse files Browse the repository at this point in the history
Dots in server target name are breaking the workflow YAML, replace them
with dashes.
  • Loading branch information
elprans committed Dec 10, 2024
1 parent 54d7e5c commit f47320a
Show file tree
Hide file tree
Showing 4 changed files with 739 additions and 734 deletions.
7 changes: 7 additions & 0 deletions .github/workflows.src/build.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
branch: ${{ steps.whichver.outputs.branch }}
<% if subdist == "nightly" %>
<% for server in servers %>
<%- set server = server.replace(".", "-") -%>
<% for tgt in targets.linux + targets.macos %>
<%- set key = tgt.name + "-edgedb-" + server %>
if_<< key.replace('-', '_') >>: ${{ steps.scm.outputs.if_<< key.replace('-', '_') >> }}
Expand All @@ -29,6 +30,7 @@
rev=$(git rev-parse HEAD)
jq_filter='.packages[] | select(.basename == $NAME) | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | . as $rev | select(($rev != null) and ($REV | startswith($rev)))'
<% for server in servers %>
<%- set server = server.replace(".", "-") -%>
<% for tgt in targets.linux %>
key="<< tgt.name >>-edgedb-<< server >>"
name="edgedb-server-<< server >>-postgis"
Expand Down Expand Up @@ -89,6 +91,7 @@
<% endif %>

<%- for server in servers %>
<%- set server = server.replace(".", "-") -%>
<%- for tgt in targets.linux %>
<%- set plat_id = tgt.platform + ("{}".format(tgt.platform_libc) if tgt.platform_libc else "") + ("-{}".format(tgt.platform_version) if tgt.platform_version else "") %>
<%- set key = tgt.name + "-edgedb-" + server %>
Expand Down Expand Up @@ -211,6 +214,7 @@
collect:
needs:
<%- for server in servers %>
<%- set server = server.replace(".", "-") -%>
<%- for tgt in targets.linux + targets.macos %>
<%- set key = tgt.name + "-edgedb-" + server %>
- build-<< key >>
Expand All @@ -222,6 +226,7 @@
<%- endif %>

<%- for server in servers %>
<%- set server = server.replace(".", "-") -%>
<%- for tgt in targets.linux %>
<%- set plat_id = tgt.platform + ("{}".format(tgt.platform_libc) if tgt.platform_libc else "") + ("-{}".format(tgt.platform_version) if tgt.platform_version else "") %>
<%- set key = tgt.name + "-edgedb-" + server %>
Expand Down Expand Up @@ -257,6 +262,7 @@

<%- if publications %>
<%- for server in servers %>
<%- set server = server.replace(".", "-") -%>
<%- for tgt in targets.macos %>
<%- set key = tgt.name + "-edgedb-" + server %>
<%- set plat_id = tgt.platform + ("{}".format(tgt.platform_libc) if tgt.platform_libc else "") + ("-{}".format(tgt.platform_version) if tgt.platform_version else "") %>
Expand Down Expand Up @@ -307,6 +313,7 @@
<%- else %>
<%- endif %>
<%- for server in servers %>
<%- set server = server.replace(".", "-") -%>
<%- for tgt in targets.linux %>
<%- set key = tgt.name + "-edgedb-" + server %>
- build-<< key >>
Expand Down
Loading

0 comments on commit f47320a

Please sign in to comment.