arch-openbox: fix external trigger, update templates

.github/workflows/external_trigger.yml

@@ -12,17 +12,20 @@ jobs:
  - name: External Trigger
  if: github.ref == 'refs/heads/arch-openbox'
  run: |
+ printf "# External trigger for docker-rdesktop\n\n" >> $GITHUB_STEP_SUMMARY
  if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX }}" ]; then
- echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX is set; skipping trigger. ****"
- echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+ echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+ echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
  exit 0
  fi
- echo "**** External trigger running off of arch-openbox branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX\". ****"
- echo "External trigger running off of arch-openbox branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX\`" >> $GITHUB_STEP_SUMMARY
- echo "**** Retrieving external version ****"
- EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/linuxserver/docker-baseimage-rdesktop/releases | jq -r 'first(.[] | select(.tag_name | startswith("arch-dbus"))) | .tag_name' | sed 's|arch-dbus-||' | sed 's|-ls.*||')
+ echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+ echo "> External trigger running off of arch-openbox branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_RDESKTOP_ARCH_OPENBOX\`" >> $GITHUB_STEP_SUMMARY
+ printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
+ EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/linuxserver/docker-baseimage-rdesktop/releases | jq -r 'first(.[] | select(.tag_name | startswith("arch"))) | .tag_name' | sed 's|arch-dbus-||' | sed 's|-ls.*||')
+ echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
  if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
- echo "**** Can't retrieve external version, exiting ****"
+ echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+ echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
  FAILURE_REASON="Can't retrieve external version for rdesktop branch arch-openbox"
  GHA_TRIGGER_URL="https://github.com/linuxserver/docker-rdesktop/actions/runs/${{ github.run_id }}"
  curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
@@ -31,9 +34,8 @@ jobs:
  exit 1
  fi
  EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
- echo "**** External version: ${EXT_RELEASE} ****"
- echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
- echo "**** Retrieving last pushed version ****"
+ echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+ echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
  image="linuxserver/rdesktop"
  tag="arch-openbox"
  token=$(curl -sX GET \
@@ -60,37 +62,34 @@ jobs:
  IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
  IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
  if [ -z "${IMAGE_VERSION}" ]; then
- echo "**** Can't retrieve last pushed version, exiting ****"
+ echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+ echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
  FAILURE_REASON="Can't retrieve last pushed version for rdesktop tag arch-openbox"
  curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
  "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
  "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
  exit 1
  fi
- echo "**** Last pushed version: ${IMAGE_VERSION} ****"
- echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
+ echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
  if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
- echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
- echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+ echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
  exit 0
  elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/arch-openbox/lastBuild/api/json | jq -r '.building') == "true" ]; then
- echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
- echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+ echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
  exit 0
  else
- echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
- echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
+ printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+ echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
  response=$(curl -iX POST \
  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/arch-openbox/buildWithParameters?PACKAGE_CHECK=false \
  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
- echo "**** Jenkins job queue url: ${response%$'\r'} ****"
- echo "**** Sleeping 10 seconds until job starts ****"
+ echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+ echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
  sleep 10
  buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
  buildurl="${buildurl%$'\r'}"
- echo "**** Jenkins job build url: ${buildurl} ****"
- echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
- echo "**** Attempting to change the Jenkins job description ****"
+ echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+ echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
  curl -iX POST \
  "${buildurl}submitDescription" \
  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \

.github/workflows/external_trigger_scheduler.yml

@@ -15,31 +15,31 @@ jobs:
 
  - name: External Trigger Scheduler
  run: |
- echo "**** Branches found: ****"
- git for-each-ref --format='%(refname:short)' refs/remotes
- for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+ printf "# External trigger scheduler for docker-rdesktop\n\n" >> $GITHUB_STEP_SUMMARY
+ printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+ for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
  do
- br=$(echo "$br" | sed 's|origin/||g')
- echo "**** Evaluating branch ${br} ****"
+ if [[ "${br}" == "HEAD" ]]; then
+ printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+ continue
+ fi
+ printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
  ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-rdesktop/${br}/jenkins-vars.yml)
  ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
  ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
  if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
- echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+ echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
  if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-rdesktop/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
- echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
- echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+ echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
  curl -iX POST \
  -H "Authorization: token ${{ secrets.CR_PAT }}" \
  -H "Accept: application/vnd.github.v3+json" \
  -d "{\"ref\":\"refs/heads/${br}\"}" \
  https://api.github.com/repos/linuxserver/docker-rdesktop/actions/workflows/external_trigger.yml/dispatches
  else
- echo "**** Workflow doesn't exist; skipping trigger. ****"
- echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+ echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
  fi
  else
- echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
- echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+ echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
  fi
  done

.github/workflows/package_trigger.yml

@@ -12,29 +12,29 @@ jobs:
  - name: Package Trigger
  if: github.ref == 'refs/heads/arch-openbox'
  run: |
+ printf "# Package trigger for docker-rdesktop\n\n" >> $GITHUB_STEP_SUMMARY
  if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX }}" ]; then
- echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX is set; skipping trigger. ****"
- echo "Github secret \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+ echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+ echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
  exit 0
  fi
  if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/arch-openbox/lastBuild/api/json | jq -r '.building') == "true" ]; then
- echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
- echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
+ echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+ echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
  exit 0
  fi
- echo "**** Package trigger running off of arch-openbox branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX\". ****"
- echo "Package trigger running off of arch-openbox branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX\`" >> $GITHUB_STEP_SUMMARY
+ echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+ echo "> Package trigger running off of arch-openbox branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_ARCH_OPENBOX\`" >> $GITHUB_STEP_SUMMARY
  response=$(curl -iX POST \
  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/arch-openbox/buildWithParameters?PACKAGE_CHECK=true \
  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
- echo "**** Jenkins job queue url: ${response%$'\r'} ****"
- echo "**** Sleeping 10 seconds until job starts ****"
+ echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+ echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
  sleep 10
  buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
  buildurl="${buildurl%$'\r'}"
- echo "**** Jenkins job build url: ${buildurl} ****"
- echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
- echo "**** Attempting to change the Jenkins job description ****"
+ echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+ echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
  curl -iX POST \
  "${buildurl}submitDescription" \
  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \

.github/workflows/package_trigger_scheduler.yml

@@ -15,17 +15,19 @@ jobs:
 
  - name: Package Trigger Scheduler
  run: |
- echo "**** Branches found: ****"
- git for-each-ref --format='%(refname:short)' refs/remotes
- for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+ printf "# Package trigger scheduler for docker-rdesktop\n\n" >> $GITHUB_STEP_SUMMARY
+ printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+ for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
  do
- br=$(echo "$br" | sed 's|origin/||g')
- echo "**** Evaluating branch ${br} ****"
+ if [[ "${br}" == "HEAD" ]]; then
+ printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+ continue
+ fi
+ printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
  ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-rdesktop/${br}/jenkins-vars.yml | yq -r '.ls_branch')
  if [ "${br}" == "${ls_branch}" ]; then
- echo "**** Branch ${br} appears to be live; checking workflow. ****"
+ echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
  if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-rdesktop/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
- echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
  echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
  triggered_branches="${triggered_branches}${br} "
  curl -iX POST \
@@ -35,11 +37,9 @@ jobs:
  https://api.github.com/repos/linuxserver/docker-rdesktop/actions/workflows/package_trigger.yml/dispatches
  sleep 30
  else
- echo "**** Workflow doesn't exist; skipping trigger. ****"
  echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
  fi
  else
- echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
  echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
  fi
  done