Skip to content

Commit f9e3486

Browse files
authored
Merge pull request #36 from linuxserver/workflows2
update workflows
2 parents c0bd22c + b33ea88 commit f9e3486

File tree

4 files changed

+70
-35
lines changed

4 files changed

+70
-35
lines changed

.github/workflows/external_trigger.yml

Lines changed: 11 additions & 5 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,17 +37,18 @@ 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')
38-
if [-z "${EXT_RELEASE}" ]; then
42+
if [ -z "${EXT_RELEASE}" ]; then
3943
echo "Can't retrieve external version, exiting"
4044
FAILURE_REASON="Can't retrieve external version for ldap-auth branch master"
4145
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
4246
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ 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
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"
29+
echo "Workflow exists. Triggering external trigger workflow for branch ${br}."
3030
curl -iX POST \
3131
-H "Authorization: token ${{ secrets.CR_PAT }}" \
3232
-H "Accept: application/vnd.github.v3+json" \
3333
-d "{\"ref\":\"refs/heads/${br}\"}" \
3434
https://api.github.com/repos/linuxserver/docker-ldap-auth/actions/workflows/external_trigger.yml/dispatches
3535
else
36-
echo "workflow doesn't exist, skipping"
36+
echo "Workflow doesn't exist; skipping trigger."
3737
fi
3838
else
39-
echo "no match, skipping"
39+
echo "${br} appears to be a dev branch; skipping trigger."
4040
fi
4141
done

.github/workflows/package_trigger.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +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-
if [ "$br" == "$ls_branch" ]; then
27-
echo "it's a match, triggering build for ${br}"
28-
curl -X POST \
29-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ldap-auth/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
30-
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }}
31-
sleep 30
32-
else
33-
echo "no match, skipping branch ${br}"
34-
fi
35-
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 }}
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)