Skip to content

Commit d336cdf

Browse files
authored
Merge pull request #50 from linuxserver/unstable-release
release unstable tag
2 parents 0694e31 + e746083 commit d336cdf

10 files changed

Lines changed: 95 additions & 125 deletions

.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-mylar3/edit/nightly/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-mylar3/edit/unstable/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-mylar3)
@@ -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-mylar3/tree/nightly/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-mylar3/tree/unstable/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-mylar3/blob/nightly/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-mylar3/blob/unstable/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

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

.github/workflows/external_trigger.yml

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

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

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/nightly'
16+
if: github.ref == 'refs/heads/unstable'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-mylar3\n\n" >> $GITHUB_STEP_SUMMARY
21-
if grep -q "^mylar3_nightly_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
21+
if grep -q "^mylar3_unstable_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2222
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
23-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`mylar3_nightly_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24-
elif grep -q "^mylar3_nightly" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
23+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`mylar3_unstable_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24+
elif grep -q "^mylar3_unstable" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2525
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
26-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`mylar3_nightly\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
26+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`mylar3_unstable\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2727
exit 0
2828
fi
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
30-
echo "> External trigger running off of nightly branch. To disable this trigger, add \`mylar3_nightly\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
30+
echo "> External trigger running off of unstable branch. To disable this trigger, add \`mylar3_unstable\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/python3-dev" | jq -r '. | .sha' | cut -c1-8)
32+
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts" | jq -r '. | .sha' | cut -c1-8)
3333
echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
34-
if grep -q "^mylar3_nightly_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
34+
if grep -q "^mylar3_unstable_${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 mylar3 branch nightly"
42+
FAILURE_REASON="Can't retrieve external version for mylar3 branch unstable"
4343
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-mylar3/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"}],
@@ -50,7 +50,7 @@ jobs:
5050
echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
5151
echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
5252
image="linuxserver/mylar3"
53-
tag="nightly"
53+
tag="unstable"
5454
token=$(curl -sX GET \
5555
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fmylar3%3Apull" \
5656
| jq -r '.token')
@@ -96,7 +96,7 @@ jobs:
9696
if [ -z "${IMAGE_VERSION}" ]; then
9797
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
9898
echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
99-
FAILURE_REASON="Can't retrieve last pushed version for mylar3 tag nightly"
99+
FAILURE_REASON="Can't retrieve last pushed version for mylar3 tag unstable"
100100
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
101101
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
102102
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -106,14 +106,14 @@ 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-mylar3/job/nightly/lastBuild/api/json | jq -r '.building') == "true" ]; then
109+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mylar3/job/unstable/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
113113
if [[ "${artifacts_found}" == "false" ]]; then
114114
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
115115
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
116-
FAILURE_REASON="New version ${EXT_RELEASE} for mylar3 tag nightly is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
116+
FAILURE_REASON="New version ${EXT_RELEASE} for mylar3 tag unstable is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
117117
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
118118
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
119119
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -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-mylar3/job/nightly/buildWithParameters?PACKAGE_CHECK=false \
127+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mylar3/job/unstable/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
@@ -139,7 +139,7 @@ jobs:
139139
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
140140
--data-urlencode "Submit=Submit"
141141
echo "**** Notifying Discord ****"
142-
TRIGGER_REASON="A version change was detected for mylar3 tag nightly. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
142+
TRIGGER_REASON="A version change was detected for mylar3 tag unstable. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
143143
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
144144
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
145145
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.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-mylar3/blob/nightly/.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-mylar3/blob/unstable/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN \
3232
zlib1g-dev && \
3333
echo "**** install mylar3 ****" && \
3434
if [ -z ${MYLAR3_RELEASE+x} ]; then \
35-
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \
35+
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
3636
| jq -r '.sha' | cut -c1-8); \
3737
fi && \
3838
mkdir /app/mylar3 && \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN \
3232
zlib1g-dev && \
3333
echo "**** install mylar3 ****" && \
3434
if [ -z ${MYLAR3_RELEASE+x} ]; then \
35-
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \
35+
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
3636
| jq -r '.sha' | cut -c1-8); \
3737
fi && \
3838
mkdir /app/mylar3 && \

0 commit comments

Comments
 (0)