@@ -139,10 +139,10 @@ on:
139139 value : ${{ jobs.deploy.outputs.url-alt }}
140140 url-direct :
141141 value : ${{ jobs.deploy.outputs.url-direct }}
142- url-dotli-path :
143- value : ${{ jobs.deploy.outputs.url-dotli-path }}
144- url-dotli-host :
145- value : ${{ jobs.deploy.outputs.url-dotli-host }}
142+ url-dotli :
143+ value : ${{ jobs.deploy.outputs.url-dotli }}
144+ url-dotli-paseo :
145+ value : ${{ jobs.deploy.outputs.url-dotli-paseo }}
146146 cache-hit :
147147 value : ${{ jobs.deploy.outputs.cache-hit }}
148148 duration-seconds :
@@ -165,8 +165,8 @@ jobs:
165165 url : ${{ steps.final.outputs.url }}
166166 url-alt : ${{ steps.final.outputs.url-alt }}
167167 url-direct : ${{ steps.final.outputs.url-direct }}
168- url-dotli-path : ${{ steps.final.outputs.url-dotli-path }}
169- url-dotli-host : ${{ steps.final.outputs.url-dotli-host }}
168+ url-dotli : ${{ steps.final.outputs.url-dotli }}
169+ url-dotli-paseo : ${{ steps.final.outputs.url-dotli-paseo }}
170170 cache-hit : ${{ steps.cache.outputs.cache-hit }}
171171 duration-seconds : ${{ steps.duration.outputs.seconds }}
172172
@@ -390,29 +390,24 @@ jobs:
390390 - name : Set outputs
391391 id : final
392392 run : |
393- DOTLI_PATH_URL="https://dot.li/${FQDN}"
393+ # dot.li serves a name as a gateway subdomain: strip the .dot TLD and
394+ # append the gateway domain (mainnet dot.li, Paseo testnet paseo.li).
395+ # e.g. pr170.dotns.dot -> pr170.dotns.dot.li / pr170.dotns.paseo.li
396+ STEM="${FQDN%.dot}"
397+ DOTLI_URL="https://${STEM}.dot.li"
398+ DOTLI_PASEO_URL="https://${STEM}.paseo.li"
394399 DIRECT_URL="https://${FQDN}"
395- DOTLI_HOST_URL=""
396-
397- if [[ -n "$SUBNAME" ]]; then
398- PRIMARY_URL="$DOTLI_PATH_URL"
399- else
400- DOTLI_HOST_URL="https://${DOMAIN}.dot.li"
401- PRIMARY_URL="$DOTLI_HOST_URL"
402- fi
403400
404401 echo "cid=$CID" >> "$GITHUB_OUTPUT"
405402 echo "fqdn=$FQDN" >> "$GITHUB_OUTPUT"
406- echo "url=$PRIMARY_URL " >> "$GITHUB_OUTPUT"
403+ echo "url=$DOTLI_URL " >> "$GITHUB_OUTPUT"
407404 echo "url-alt=$DIRECT_URL" >> "$GITHUB_OUTPUT"
408405 echo "url-direct=$DIRECT_URL" >> "$GITHUB_OUTPUT"
409- echo "url-dotli-path=$DOTLI_PATH_URL " >> "$GITHUB_OUTPUT"
410- echo "url-dotli-host=$DOTLI_HOST_URL " >> "$GITHUB_OUTPUT"
406+ echo "url-dotli=$DOTLI_URL " >> "$GITHUB_OUTPUT"
407+ echo "url-dotli-paseo=$DOTLI_PASEO_URL " >> "$GITHUB_OUTPUT"
411408 env :
412409 CID : ${{ steps.cid.outputs.cid }}
413410 FQDN : ${{ steps.target.outputs.fqdn }}
414- DOMAIN : ${{ steps.target.outputs.domain }}
415- SUBNAME : ${{ steps.target.outputs.subname }}
416411
417412 - name : Compute deploy duration
418413 id : duration
@@ -436,15 +431,12 @@ jobs:
436431 BULLETIN_AUTH="alice"
437432 fi
438433
439- if [[ -n "$SUBNAME" ]]; then
440- URL_ROWS=$(cat <<EOF
441- | URL (dot .li) | [${URL_DOTLI_PATH }](${URL_DOTLI_PATH }) |
434+ URL_ROWS=$(cat <<EOF
435+ | URL (dot.li) | [${URL_DOTLI}](${URL_DOTLI}) |
436+ | URL (paseo .li) | [${URL_DOTLI_PASEO }](${URL_DOTLI_PASEO }) |
442437 | URL (direct) | [${URL_DIRECT}](${URL_DIRECT}) |
443438 EOF
444- )
445- else
446- URL_ROWS="| URL | [${URL_DOTLI_HOST}](${URL_DOTLI_HOST}) |"
447- fi
439+ )
448440
449441 cat >> "$GITHUB_STEP_SUMMARY" <<EOF
450442 ## Deployment Complete
@@ -463,9 +455,8 @@ jobs:
463455 FQDN : ${{ steps.final.outputs.fqdn }}
464456 CID : ${{ steps.final.outputs.cid }}
465457 URL_DIRECT : ${{ steps.final.outputs.url-direct }}
466- URL_DOTLI_PATH : ${{ steps.final.outputs.url-dotli-path }}
467- URL_DOTLI_HOST : ${{ steps.final.outputs.url-dotli-host }}
468- SUBNAME : ${{ steps.target.outputs.subname }}
458+ URL_DOTLI : ${{ steps.final.outputs.url-dotli }}
459+ URL_DOTLI_PASEO : ${{ steps.final.outputs.url-dotli-paseo }}
469460 DURATION_SECONDS : ${{ steps.duration.outputs.seconds }}
470461 BULLETIN_MNEMONIC : ${{ secrets.bulletin-mnemonic }}
471462 CACHE_HIT : ${{ steps.cache.outputs.cache-hit }}
0 commit comments