Skip to content

Commit b33ea88

Browse files
aptalcaaptalca
committed
update workflows
1 parent ecb57dd commit b33ea88

File tree

4 files changed

+71
-45
lines changed

4 files changed

+71
-45
lines changed

‎.github/workflows/external_trigger.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ jobs:
1212
- name: External Trigger
1313
if: github.ref == 'refs/heads/master'
1414
run: |
15-
echo "external trigger running off of master branch"
16-
echo "setting env vars"
15+
if [ -n ${{ secrets.PAUSE_EXTERNAL_TRIGGER_LDAP_AUTH_MASTER }} ]; then
16+
echo "Github secret PAUSE_EXTERNAL_TRIGGER_LDAP_AUTH_MASTER is set; skipping trigger."
17+
exit 0
18+
fi
19+
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_LDAP_AUTH_MASTER\"."
20+
echo "Setting env vars"
1721
EXT_RELEASE_TYPE='pip_version'
1822
EXT_PIP='python-ldap'
1923
BUILD_VERSION_ARG='LDAP_VERSION'
@@ -33,7 +37,7 @@ jobs:
3337
CI_DOCKERENV='TZ=US/Pacific'
3438
CI_AUTH='user:password'
3539
CI_WEBPATH='/test'
36-
echo "retrieving external version"
40+
echo "Retrieving external version"
3741
EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/${EXT_PIP}/json" |jq -r '. | .info.version')
3842
if [ -z "${EXT_RELEASE}" ]; then
3943
echo "Can't retrieve external version, exiting"
@@ -43,7 +47,8 @@ jobs:
4347
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
4448
exit 1
4549
fi
46-
echo "retrieving last pushed version"
50+
echo "External version: ${EXT_RELEASE}"
51+
echo "Retrieving last pushed version"
4752
image="${LS_USER}/ldap-auth"
4853
tag="latest"
4954
token=$(curl -s \
@@ -68,6 +73,7 @@ jobs:
6873
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
6974
exit 1
7075
fi
76+
echo "Last pushed version: ${IMAGE_VERSION}"
7177
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
7278
echo "Version ${EXT_RELEASE} already pushed, exiting"
7379
exit 0

‎.github/workflows/external_trigger_scheduler.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,18 @@ 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)
2626
if [ "$br" == "$ls_branch" ]; then
2727
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."
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
29+
echo "Workflow exists. Triggering external trigger workflow for branch ${br}."
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
4135
else
4236
echo "Workflow doesn't exist; skipping trigger."
4337
fi

‎.github/workflows/package_trigger.yml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
1-
name: Package Trigger
1+
name: Package Trigger Main
22

33
on:
4-
schedule:
5-
- cron: '52 14 * * 4'
64
workflow_dispatch:
75

86
jobs:
9-
package-trigger:
7+
package-trigger-master:
108
runs-on: ubuntu-latest
119
steps:
1210
- uses: actions/[email protected]
13-
with:
14-
fetch-depth: '0'
15-
11+
1612
- name: Package Trigger
13+
if: github.ref == 'refs/heads/master'
1714
run: |
18-
git for-each-ref --format='%(refname:short)' refs/remotes
19-
docker pull ghcr.io/linuxserver/yq
20-
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
21-
do
22-
br=$(echo "$br" | sed 's|origin/||g')
23-
echo "Evaluating branch ${br}"
24-
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/jenkins-vars.yml \
25-
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
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}\")."
29-
curl -X POST \
30-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ldap-auth/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
31-
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }}
32-
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."
35-
else
36-
echo "${br} appears to be a dev branch; skipping."
37-
fi
38-
done
15+
if [ -n ${{ secrets.PAUSE_PACKAGE_TRIGGER_LDAP_AUTH_MASTER }} ]; then
16+
echo "Github secret PAUSE_PACKAGE_TRIGGER_LDAP_AUTH_MASTER is set; skipping trigger."
17+
exit 0
18+
fi
19+
echo "Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_LDAP_AUTH_MASTER\"."
20+
curl -X POST \
21+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ldap-auth/job/master/buildWithParameters?PACKAGE_CHECK=true \
22+
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }}

‎.github/workflows/package_trigger_scheduler.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Package Trigger Scheduler
2+
3+
on:
4+
schedule:
5+
- cron: '52 14 * * 4'
6+
workflow_dispatch:
7+
8+
jobs:
9+
package-trigger-scheduler:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/[email protected]
13+
with:
14+
fetch-depth: '0'
15+
16+
- name: Package Trigger Scheduler
17+
run: |
18+
git for-each-ref --format='%(refname:short)' refs/remotes
19+
docker pull ghcr.io/linuxserver/yq
20+
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
21+
do
22+
br=$(echo "$br" | sed 's|origin/||g')
23+
echo "Evaluating branch ${br}"
24+
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/jenkins-vars.yml \
25+
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
26+
if [ "${br}" == "${ls_branch}" ]; then
27+
echo "Branch ${br} appears to be live; triggering."
28+
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-ldap-auth/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
29+
echo "Workflow exists. Triggering package trigger workflow for branch ${br}."
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/package_trigger.yml/dispatches
35+
sleep 30
36+
else
37+
echo "Workflow doesn't exist; skipping trigger."
38+
fi
39+
else
40+
echo "${br} appears to be a dev branch; skipping trigger."
41+
fi
42+
done

0 commit comments

Comments
 (0)