Skip to content

Commit ecb57dd

Browse files
committed
update workflows
1 parent c0bd22c commit ecb57dd

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
CI_WEBPATH='/test'
3636
echo "retrieving external version"
3737
EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/${EXT_PIP}/json" |jq -r '. | .info.version')
38-
if [-z "${EXT_RELEASE}" ]; then
38+
if [ -z "${EXT_RELEASE}" ]; then
3939
echo "Can't retrieve external version, exiting"
4040
FAILURE_REASON="Can't retrieve external version for ldap-auth branch master"
4141
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,

.github/workflows/external_trigger_scheduler.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,24 @@ jobs:
2424
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/jenkins-vars.yml \
2525
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
2626
if [ "$br" == "$ls_branch" ]; then
27-
echo "it's a match, checking workflow"
27+
echo "${br} is a live branch, checking workflow."
2828
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
29-
echo "workflow exists, triggering"
30-
curl -iX POST \
31-
-H "Authorization: token ${{ secrets.CR_PAT }}" \
32-
-H "Accept: application/vnd.github.v3+json" \
33-
-d "{\"ref\":\"refs/heads/${br}\"}" \
34-
https://api.github.com/repos/linuxserver/docker-ldap-auth/actions/workflows/external_trigger.yml/dispatches
29+
echo "Workflow exists."
30+
pause_trigger="$(eval echo \${pause_external_trigger_ldap-auth_$ls_branch})"
31+
if [ -z "$pause_trigger" ]; then
32+
echo "Triggering external build for branch ${br} (you can pause this trigger by setting a github secret \"pause_external_trigger_ldap-auth_${ls_branch}\")."
33+
curl -iX POST \
34+
-H "Authorization: token ${{ secrets.CR_PAT }}" \
35+
-H "Accept: application/vnd.github.v3+json" \
36+
-d "{\"ref\":\"refs/heads/${br}\"}" \
37+
https://api.github.com/repos/linuxserver/docker-ldap-auth/actions/workflows/external_trigger.yml/dispatches
38+
else
39+
echo "Github secret \"pause_external_trigger_ldap-auth_${ls_branch}\" is set; skipping trigger."
40+
fi
3541
else
36-
echo "workflow doesn't exist, skipping"
42+
echo "Workflow doesn't exist; skipping trigger."
3743
fi
3844
else
39-
echo "no match, skipping"
45+
echo "${br} appears to be a dev branch; skipping trigger."
4046
fi
4147
done

.github/workflows/package_trigger.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ jobs:
2020
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
2121
do
2222
br=$(echo "$br" | sed 's|origin/||g')
23-
echo "evaluating branch ${br}"
23+
echo "Evaluating branch ${br}"
2424
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/jenkins-vars.yml \
2525
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
26-
if [ "$br" == "$ls_branch" ]; then
27-
echo "it's a match, triggering build for ${br}"
26+
pause_trigger="$(eval echo \${pause_package_trigger_ldap-auth_$ls_branch})"
27+
if [ "${br}" == "${ls_branch}" ] && [ -z "${pause_triger}" ]; then
28+
echo "${br} is a live branch; triggering package build (you can pause this trigger by setting a github secret \"pause_package_trigger_ldap-auth_${ls_branch}\")."
2829
curl -X POST \
2930
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ldap-auth/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
3031
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }}
3132
sleep 30
33+
elif [ "${br}" == "${ls_branch}" ] && [ -n "${pause_triger}" ]; then
34+
echo "Github secret \"pause_package_trigger_ldap-auth_${ls_branch}\" is set; skipping trigger."
3235
else
33-
echo "no match, skipping branch ${br}"
36+
echo "${br} appears to be a dev branch; skipping."
3437
fi
3538
done

0 commit comments

Comments
 (0)