Skip to content

Commit 9d66a79

Browse files
thelamerthelamer
committed
wrong branch name
1 parent 0c81551 commit 9d66a79

7 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-joplin/edit/main/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-joplin/edit/master/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-joplin)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
115115

116116
## Update the changelog
117117

118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-joplin/tree/main/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-joplin/tree/master/root), add an entry to the changelog
119119

120120
```yml
121121
changelogs:

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-joplin/blob/main/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-joplin/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

‎.github/workflows/external_trigger.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@ permissions:
77
contents: read
88

99
jobs:
10-
external-trigger-main:
10+
external-trigger-master:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/[email protected]
1414

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/main'
16+
if: github.ref == 'refs/heads/master'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-joplin\n\n" >> $GITHUB_STEP_SUMMARY
21-
if grep -q "^joplin_main_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
21+
if grep -q "^joplin_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2222
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
23-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`joplin_main_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24-
elif grep -q "^joplin_main" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
23+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`joplin_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24+
elif grep -q "^joplin_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2525
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
26-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`joplin_main\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
26+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`joplin_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2727
exit 0
2828
fi
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
30-
echo "> External trigger running off of main branch. To disable this trigger, add \`joplin_main\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
30+
echo "> External trigger running off of master branch. To disable this trigger, add \`joplin_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
3232
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/laurent22/joplin/releases/latest" | jq -r '. | .tag_name')
3333
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
34-
if grep -q "^joplin_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
34+
if grep -q "^joplin_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3636
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
3737
exit 0
3838
fi
3939
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
4040
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
4141
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
42-
FAILURE_REASON="Can't retrieve external version for joplin branch main"
42+
FAILURE_REASON="Can't retrieve external version for joplin branch master"
4343
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-joplin/actions/runs/${{ github.run_id }}"
4444
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
4545
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -106,7 +106,7 @@ jobs:
106106
if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
107107
echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
108108
exit 0
109-
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-joplin/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
109+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-joplin/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
110110
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
111111
exit 0
112112
else
@@ -124,7 +124,7 @@ jobs:
124124
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
125125
fi
126126
response=$(curl -iX POST \
127-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-joplin/job/main/buildWithParameters?PACKAGE_CHECK=false \
127+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-joplin/job/master/buildWithParameters?PACKAGE_CHECK=false \
128128
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
129129
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
130130
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/first-interaction@v1
1616
with:
1717
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
18-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-joplin/blob/main/.github/PULL_REQUEST_TEMPLATE.md)!'
18+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-joplin/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎Jenkinsfile‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ pipeline {
196196
}
197197
}
198198
}
199-
// If this is a main build use live docker endpoints
199+
// If this is a master build use live docker endpoints
200200
stage("Set ENV live build"){
201201
when {
202-
branch "main"
202+
branch "master"
203203
environment name: 'CHANGE_ID', value: ''
204204
}
205205
steps {
@@ -223,7 +223,7 @@ pipeline {
223223
// If this is a dev build use dev docker endpoints
224224
stage("Set ENV dev build"){
225225
when {
226-
not {branch "main"}
226+
not {branch "master"}
227227
environment name: 'CHANGE_ID', value: ''
228228
}
229229
steps {
@@ -301,7 +301,7 @@ pipeline {
301301
// Use helper containers to render templated files
302302
stage('Update-Templates') {
303303
when {
304-
branch "main"
304+
branch "master"
305305
environment name: 'CHANGE_ID', value: ''
306306
expression {
307307
env.CONTAINER_NAME != null
@@ -313,24 +313,24 @@ pipeline {
313313
TEMPDIR=$(mktemp -d)
314314
docker pull ghcr.io/linuxserver/jenkins-builder:latest
315315
# Cloned repo paths for templating:
316-
# ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch main of ${LS_USER}/${LS_REPO} for running the jenkins builder on
317-
# ${TEMPDIR}/repo/${LS_REPO}: Cloned branch main of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
316+
# ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
317+
# ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
318318
# ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
319319
# ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
320320
# ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
321-
git clone --branch main --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
321+
git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
322322
docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest
323323
echo "Starting Stage 1 - Jenkinsfile update"
324324
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
325325
mkdir -p ${TEMPDIR}/repo
326326
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
327327
cd ${TEMPDIR}/repo/${LS_REPO}
328-
git checkout -f main
328+
git checkout -f master
329329
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
330330
git add Jenkinsfile
331331
git commit -m 'Bot Updating Templated Files'
332-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
333-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
332+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
333+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
334334
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
335335
echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
336336
rm -Rf ${TEMPDIR}
@@ -349,13 +349,13 @@ pipeline {
349349
mkdir -p ${TEMPDIR}/repo
350350
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
351351
cd ${TEMPDIR}/repo/${LS_REPO}
352-
git checkout -f main
352+
git checkout -f master
353353
for i in ${TEMPLATES_TO_DELETE}; do
354354
git rm "${i}"
355355
done
356356
git commit -m 'Bot Updating Templated Files'
357-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
358-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
357+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
358+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
359359
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
360360
echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
361361
rm -Rf ${TEMPDIR}
@@ -378,12 +378,12 @@ pipeline {
378378
mkdir -p ${TEMPDIR}/repo
379379
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
380380
cd ${TEMPDIR}/repo/${LS_REPO}
381-
git checkout -f main
381+
git checkout -f master
382382
cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
383383
git add readme-vars.yml
384384
git commit -m 'Bot Updating Templated Files'
385-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
386-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
385+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
386+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
387387
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
388388
echo "Updating templates and exiting build, new one will trigger based on commit"
389389
rm -Rf ${TEMPDIR}
@@ -400,7 +400,7 @@ pipeline {
400400
mkdir -p ${TEMPDIR}/repo
401401
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
402402
cd ${TEMPDIR}/repo/${LS_REPO}
403-
git checkout -f main
403+
git checkout -f master
404404
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
405405
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
406406
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -413,8 +413,8 @@ pipeline {
413413
fi
414414
git add readme-vars.yml ${TEMPLATED_FILES}
415415
git commit -m 'Bot Updating Templated Files'
416-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
417-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
416+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
417+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
418418
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
419419
echo "Updating templates and exiting build, new one will trigger based on commit"
420420
rm -Rf ${TEMPDIR}
@@ -515,7 +515,7 @@ pipeline {
515515
// Exit the build if the Templated files were just updated
516516
stage('Template-exit') {
517517
when {
518-
branch "main"
518+
branch "master"
519519
environment name: 'CHANGE_ID', value: ''
520520
environment name: 'FILES_UPDATED', value: 'true'
521521
expression {
@@ -528,10 +528,10 @@ pipeline {
528528
}
529529
}
530530
}
531-
// If this is a main build check the S6 service file perms
531+
// If this is a master build check the S6 service file perms
532532
stage("Check S6 Service file Permissions"){
533533
when {
534-
branch "main"
534+
branch "master"
535535
environment name: 'CHANGE_ID', value: ''
536536
environment name: 'EXIT_STATUS', value: ''
537537
}
@@ -776,7 +776,7 @@ pipeline {
776776
// Take the image we just built and dump package versions for comparison
777777
stage('Update-packages') {
778778
when {
779-
branch "main"
779+
branch "master"
780780
environment name: 'CHANGE_ID', value: ''
781781
environment name: 'EXIT_STATUS', value: ''
782782
}
@@ -799,14 +799,14 @@ pipeline {
799799
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
800800
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
801801
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
802-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f main
802+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
803803
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
804804
cd ${TEMPDIR}/${LS_REPO}/
805805
wait
806806
git add package_versions.txt
807807
git commit -m 'Bot Updating Package Versions'
808-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
809-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
808+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
809+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
810810
echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
811811
echo "Package tag updated, stopping build process"
812812
else
@@ -824,7 +824,7 @@ pipeline {
824824
// Exit the build if the package file was just updated
825825
stage('PACKAGE-exit') {
826826
when {
827-
branch "main"
827+
branch "master"
828828
environment name: 'CHANGE_ID', value: ''
829829
environment name: 'PACKAGE_UPDATED', value: 'true'
830830
environment name: 'EXIT_STATUS', value: ''
@@ -838,7 +838,7 @@ pipeline {
838838
// Exit the build if this is just a package check and there are no changes to push
839839
stage('PACKAGECHECK-exit') {
840840
when {
841-
branch "main"
841+
branch "master"
842842
environment name: 'CHANGE_ID', value: ''
843843
environment name: 'PACKAGE_UPDATED', value: 'false'
844844
environment name: 'EXIT_STATUS', value: ''
@@ -980,7 +980,7 @@ pipeline {
980980
// If this is a public release tag it in the LS Github
981981
stage('Github-Tag-Push-Release') {
982982
when {
983-
branch "main"
983+
branch "master"
984984
expression {
985985
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
986986
}
@@ -992,14 +992,14 @@ pipeline {
992992
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
993993
-d '{"tag":"'${META_TAG}'",\
994994
"object": "'${COMMIT_SHA}'",\
995-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
995+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
996996
"type": "commit",\
997997
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
998998
echo "Pushing New release for Tag"
999999
sh '''#! /bin/bash
10001000
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
10011001
echo '{"tag_name":"'${META_TAG}'",\
1002-
"target_commitish": "main",\
1002+
"target_commitish": "master",\
10031003
"name": "'${META_TAG}'",\
10041004
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
10051005
printf '","draft": false,"prerelease": false}' >> releasebody.json
@@ -1010,14 +1010,14 @@ pipeline {
10101010
// Add protection to the release branch
10111011
stage('Github-Release-Branch-Protection') {
10121012
when {
1013-
branch "main"
1013+
branch "master"
10141014
environment name: 'CHANGE_ID', value: ''
10151015
environment name: 'EXIT_STATUS', value: ''
10161016
}
10171017
steps {
1018-
echo "Setting up protection for release branch main"
1018+
echo "Setting up protection for release branch master"
10191019
sh '''#! /bin/bash
1020-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/main/protection \
1020+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
10211021
-d $(jq -c . << EOF
10221022
{
10231023
"required_status_checks": null,

0 commit comments

Comments
 (0)