Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 63a7099

Browse files
aptalcathelamer
aptalca
authored and
thelamer
committed
publish bionic tag from branch bionic
1 parent 81b91e5 commit 63a7099

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎.github/workflows/external_trigger.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
external-trigger-master:
7+
external-trigger-bionic:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2.3.3
1111

1212
- name: External Trigger
13-
if: github.ref == 'refs/heads/master'
13+
if: github.ref == 'refs/heads/bionic'
1414
run: |
15-
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER }}" ]; then
16-
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER is set; skipping trigger. ****"
15+
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC }}" ]; then
16+
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC is set; skipping trigger. ****"
1717
exit 0
1818
fi
19-
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER\". ****"
19+
echo "**** External trigger running off of bionic branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC\". ****"
2020
echo "**** Retrieving external version ****"
2121
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/gclient/releases/latest" | jq -r '. | .tag_name')
2222
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2323
echo "**** Can't retrieve external version, exiting ****"
24-
FAILURE_REASON="Can't retrieve external version for baseimage-rdesktop-web branch master"
24+
FAILURE_REASON="Can't retrieve external version for baseimage-rdesktop-web branch bionic"
2525
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-baseimage-rdesktop-web/actions/runs/${{ github.run_id }}"
2626
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
2727
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -64,13 +64,13 @@ jobs:
6464
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
6565
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
6666
exit 0
67-
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
67+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/bionic/lastBuild/api/json | jq -r '.building') == "true" ]; then
6868
echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
6969
exit 0
7070
else
7171
echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
7272
response=$(curl -iX POST \
73-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/master/buildWithParameters?PACKAGE_CHECK=false \
73+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/bionic/buildWithParameters?PACKAGE_CHECK=false \
7474
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
7575
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
7676
echo "**** Sleeping 10 seconds until job starts ****"

‎.github/workflows/package_trigger.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
package-trigger-master:
7+
package-trigger-bionic:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2.3.3
1111

1212
- name: Package Trigger
13-
if: github.ref == 'refs/heads/master'
13+
if: github.ref == 'refs/heads/bionic'
1414
run: |
15-
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER }}" ]; then
16-
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER is set; skipping trigger. ****"
15+
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC }}" ]; then
16+
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC is set; skipping trigger. ****"
1717
exit 0
1818
fi
19-
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
19+
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/bionic/lastBuild/api/json | jq -r '.building') == "true" ]; then
2020
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
2121
exit 0
2222
fi
23-
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_MASTER\". ****"
23+
echo "**** Package trigger running off of bionic branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_WEB_BIONIC\". ****"
2424
response=$(curl -iX POST \
25-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/master/buildWithParameters?PACKAGE_CHECK=true \
25+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop-web/job/bionic/buildWithParameters?PACKAGE_CHECK=true \
2626
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
2727
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
2828
echo "**** Sleeping 10 seconds until job starts ****"

‎Jenkinsfile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ pipeline {
129129
}
130130
}
131131
}
132-
// If this is a master build use live docker endpoints
132+
// If this is a bionic build use live docker endpoints
133133
stage("Set ENV live build"){
134134
when {
135-
branch "master"
135+
branch "bionic"
136136
environment name: 'CHANGE_ID', value: ''
137137
}
138138
steps {
@@ -154,7 +154,7 @@ pipeline {
154154
// If this is a dev build use dev docker endpoints
155155
stage("Set ENV dev build"){
156156
when {
157-
not {branch "master"}
157+
not {branch "bionic"}
158158
environment name: 'CHANGE_ID', value: ''
159159
}
160160
steps {
@@ -229,7 +229,7 @@ pipeline {
229229
// Use helper containers to render templated files
230230
stage('Update-Templates') {
231231
when {
232-
branch "master"
232+
branch "bionic"
233233
environment name: 'CHANGE_ID', value: ''
234234
expression {
235235
env.CONTAINER_NAME != null
@@ -240,13 +240,13 @@ pipeline {
240240
set -e
241241
TEMPDIR=$(mktemp -d)
242242
docker pull ghcr.io/linuxserver/jenkins-builder:latest
243-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
243+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=bionic -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
244244
# Stage 1 - Jenkinsfile update
245245
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
246246
mkdir -p ${TEMPDIR}/repo
247247
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
248248
cd ${TEMPDIR}/repo/${LS_REPO}
249-
git checkout -f master
249+
git checkout -f bionic
250250
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
251251
git add Jenkinsfile
252252
git commit -m 'Bot Updating Templated Files'
@@ -269,7 +269,7 @@ pipeline {
269269
mkdir -p ${TEMPDIR}/repo
270270
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
271271
cd ${TEMPDIR}/repo/${LS_REPO}
272-
git checkout -f master
272+
git checkout -f bionic
273273
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
274274
for i in ${TEMPLATES_TO_DELETE}; do
275275
git rm "${i}"
@@ -291,7 +291,7 @@ pipeline {
291291
mkdir -p ${TEMPDIR}/repo
292292
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
293293
cd ${TEMPDIR}/repo/${LS_REPO}
294-
git checkout -f master
294+
git checkout -f bionic
295295
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
296296
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
297297
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -328,7 +328,7 @@ pipeline {
328328
// Exit the build if the Templated files were just updated
329329
stage('Template-exit') {
330330
when {
331-
branch "master"
331+
branch "bionic"
332332
environment name: 'CHANGE_ID', value: ''
333333
environment name: 'FILES_UPDATED', value: 'true'
334334
expression {
@@ -437,7 +437,7 @@ pipeline {
437437
// Take the image we just built and dump package versions for comparison
438438
stage('Update-packages') {
439439
when {
440-
branch "master"
440+
branch "bionic"
441441
environment name: 'CHANGE_ID', value: ''
442442
environment name: 'EXIT_STATUS', value: ''
443443
}
@@ -465,7 +465,7 @@ pipeline {
465465
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
466466
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
467467
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
468-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
468+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f bionic
469469
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
470470
cd ${TEMPDIR}/${LS_REPO}/
471471
wait
@@ -489,7 +489,7 @@ pipeline {
489489
// Exit the build if the package file was just updated
490490
stage('PACKAGE-exit') {
491491
when {
492-
branch "master"
492+
branch "bionic"
493493
environment name: 'CHANGE_ID', value: ''
494494
environment name: 'PACKAGE_UPDATED', value: 'true'
495495
environment name: 'EXIT_STATUS', value: ''
@@ -503,7 +503,7 @@ pipeline {
503503
// Exit the build if this is just a package check and there are no changes to push
504504
stage('PACKAGECHECK-exit') {
505505
when {
506-
branch "master"
506+
branch "bionic"
507507
environment name: 'CHANGE_ID', value: ''
508508
environment name: 'PACKAGE_UPDATED', value: 'false'
509509
environment name: 'EXIT_STATUS', value: ''
@@ -695,7 +695,7 @@ pipeline {
695695
// If this is a public release tag it in the LS Github
696696
stage('Github-Tag-Push-Release') {
697697
when {
698-
branch "master"
698+
branch "bionic"
699699
expression {
700700
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
701701
}
@@ -707,14 +707,14 @@ pipeline {
707707
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
708708
-d '{"tag":"'${META_TAG}'",\
709709
"object": "'${COMMIT_SHA}'",\
710-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
710+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to bionic",\
711711
"type": "commit",\
712712
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
713713
echo "Pushing New release for Tag"
714714
sh '''#! /bin/bash
715715
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
716716
echo '{"tag_name":"'${META_TAG}'",\
717-
"target_commitish": "master",\
717+
"target_commitish": "bionic",\
718718
"name": "'${META_TAG}'",\
719719
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
720720
printf '","draft": false,"prerelease": false}' >> releasebody.json

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project_name: docker-baseimage-rdesktop-web
55
external_type: github_stable
66
release_type: stable
77
release_tag: bionic
8-
ls_branch: master
8+
ls_branch: bionic
99
repo_vars:
1010
- EXT_GIT_BRANCH = 'master'
1111
- EXT_USER = 'linuxserver'

0 commit comments

Comments
 (0)