From 5775e61fdba1100eea3832e5e590d14ba2d298f9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 17 Nov 2020 14:20:24 -0500 Subject: [PATCH] fix workflows --- .github/workflows/external_trigger.yml | 2 +- .github/workflows/external_trigger_scheduler.yml | 10 ++++++---- .github/workflows/package_trigger.yml | 13 ++++++++++--- .github/workflows/package_trigger_scheduler.yml | 12 +++++++----- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index f1e228d7..7637594a 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: - external-trigger-3.11: + external-trigger-3-11: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.3 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 6e2bc743..e091ea8a 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -15,16 +15,18 @@ jobs: - name: External Trigger Scheduler run: | + echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') - echo "Evaluating branch ${br}" + echo "**** Evaluating branch ${br} ****" ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-alpine-nginx/${br}/jenkins-vars.yml \ | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) if [ "$br" == "$ls_branch" ]; then - echo "${br} is a live branch, checking workflow." + echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-alpine-nginx/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then echo "Workflow exists. Triggering external trigger workflow for branch ${br}." curl -iX POST \ @@ -33,9 +35,9 @@ jobs: -d "{\"ref\":\"refs/heads/${br}\"}" \ https://api.github.com/repos/linuxserver/docker-baseimage-alpine-nginx/actions/workflows/external_trigger.yml/dispatches else - echo "Workflow doesn't exist; skipping trigger." + echo "**** Workflow doesn't exist; skipping trigger. ****" fi else - echo "${br} appears to be a dev branch; skipping trigger." + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 2decaae1..4a39a7d4 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: - package-trigger-3.11: + package-trigger-3-11: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.3 @@ -17,6 +17,13 @@ jobs: exit 0 fi echo "Package trigger running off of 3.11 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_11\"." - curl -X POST \ + response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.11/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ No newline at end of file + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 421a2614..170252b6 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -15,18 +15,20 @@ jobs: - name: Package Trigger Scheduler run: | + echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') - echo "Evaluating branch ${br}" + echo "**** Evaluating branch ${br} ****" ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-alpine-nginx/${br}/jenkins-vars.yml \ | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) if [ "${br}" == "${ls_branch}" ]; then - echo "Branch ${br} appears to be live; triggering." + echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-alpine-nginx/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "Workflow exists. Triggering package trigger workflow for branch ${br}." + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -34,9 +36,9 @@ jobs: https://api.github.com/repos/linuxserver/docker-baseimage-alpine-nginx/actions/workflows/package_trigger.yml/dispatches sleep 30 else - echo "Workflow doesn't exist; skipping trigger." + echo "**** Workflow doesn't exist; skipping trigger. ****" fi else - echo "${br} appears to be a dev branch; skipping trigger." + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" fi done