From 964d480a877e02fb60f33487eeaea55b7d43f6a9 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Mon, 16 Nov 2020 13:18:38 -0500
Subject: [PATCH] update workflows

---
 .github/workflows/external_trigger.yml        | 46 ++++++-------------
 .../workflows/external_trigger_scheduler.yml  |  2 +-
 .../workflows/package_trigger_scheduler.yml   |  2 +-
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 5453b9d..36a67cd 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -17,29 +17,8 @@ jobs:
             exit 0
           fi
           echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HTPCMANAGER_MASTER\"."
-          echo "Setting env vars"
-          EXT_GIT_BRANCH='master2'
-          EXT_USER='HTPC-Manager'
-          EXT_REPO='HTPC-Manager'
-          BUILD_VERSION_ARG='HTPCMANAGER_COMMIT'
-          LS_USER='linuxserver'
-          LS_REPO='docker-htpcmanager'
-          CONTAINER_NAME='htpcmanager'
-          DOCKERHUB_IMAGE='linuxserver/htpcmanager'
-          DEV_DOCKERHUB_IMAGE='lsiodev/htpcmanager'
-          PR_DOCKERHUB_IMAGE='lspipepr/htpcmanager'
-          DIST_IMAGE='alpine'
-          MULTIARCH='true'
-          CI='true'
-          CI_WEB='true'
-          CI_PORT='8085'
-          CI_SSL='false'
-          CI_DELAY='120'
-          CI_DOCKERENV='TZ=US/Pacific'
-          CI_AUTH='user:password'
-          CI_WEBPATH=''
           echo "Retrieving external version"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH}" | jq -r '. | .sha' | cut -c1-8)
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/HTPC-Manager/HTPC-Manager/commits/master2" | jq -r '. | .sha' | cut -c1-8)
           if [ -z "${EXT_RELEASE}" ]; then
             echo "Can't retrieve external version, exiting"
             FAILURE_REASON="Can't retrieve external version for htpcmanager branch master"
@@ -50,19 +29,24 @@ jobs:
           fi
           echo "External version: ${EXT_RELEASE}"
           echo "Retrieving last pushed version"
-          image="${LS_USER}/htpcmanager"
+          image="linuxserver/htpcmanager"
           tag="latest"
-          token=$(curl -s \
-            "https://auth.docker.io/token?scope=repository:${image}:pull&service=registry.docker.io" \
+          token=$(curl -sX GET \
+            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fhtpcmanager%3Apull" \
             | jq -r '.token')
-          digest=$(curl -s \
-            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Authorization: Bearer ${token}" \
-            "https://registry-1.docker.io/v2/${image}/manifests/${tag}" \
-            | jq -r '.config.digest')
+            multidigest=$(curl -s \
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
+              | jq -r 'first(.manifests[].digest)')
+            digest=$(curl -s \
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+              | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://registry-1.docker.io/v2/${image}/blobs/${digest}" \
+            "https://ghcr.io/v2/${image}/blobs/${digest}" \
             | jq -r '.container_config')
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml
index f7a268d..71c1cfd 100644
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -2,7 +2,7 @@ name: External Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '10 * * * *'
+    - cron:  '40 * * * *'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml
index 1d8c2bd..66231a8 100644
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '54 5 * * 5'
+    - cron:  '15 11 * * 1'
   workflow_dispatch:
 
 jobs: