Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

retrieve version from gitea, add backup mirror for download #9

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BLENDER_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BLENDER_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL https://mirrors.iu13.net/blender/source/ | awk -F'"|/"' '/blender-[0-9]*\.[0-9]*\.[0-9]*\.tar\.xz/ && !/md5sum/ {print $8}' | tail -1 | sed 's|blender-||' | sed 's|\.tar\.xz||')
EXT_RELEASE=$(curl -s https://projects.blender.org/api/v1/repos/blender/blender/tags | jq -r '.[] | select(.name | contains("-rc") | not) | .name' | sed 's|^v||g' | sort -rV | head -1)
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for blender branch master"
Expand Down
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ RUN \
echo "**** install blender ****" && \
mkdir /blender && \
if [ -z ${BLENDER_VERSION+x} ]; then \
BLENDER_VERSION=$(curl -sL https://mirrors.iu13.net/blender/source/ \
| awk -F'"|/"' '/blender-[0-9]*\.[0-9]*\.[0-9]*\.tar\.xz/ && !/md5sum/ {print $8}' \
| tail -1 \
| sed 's|blender-||' \
| sed 's|\.tar\.xz||'); \
BLENDER_VERSION=$(curl -s https://projects.blender.org/api/v1/repos/blender/blender/tags \
| jq -r '.[] | select(.name | contains("-rc") | not) | .name' \
| sed 's|^v||g' | sort -rV | head -1); \
fi && \
BLENDER_FOLDER=$(echo "Blender${BLENDER_VERSION}" | sed -r 's|(Blender[0-9]*\.[0-9]*)\.[0-9]*|\1|') && \
curl -o \
/tmp/blender.tar.xz -L \
"https://mirrors.iu13.net/blender/release/${BLENDER_FOLDER}/blender-${BLENDER_VERSION}-linux-x64.tar.xz" && \
/tmp/blender.tar.xz -fL \
"https://mirror.clarkson.edu/blender/release/${BLENDER_FOLDER}/blender-${BLENDER_VERSION}-linux-x64.tar.xz" || \
curl -o \
/tmp/blender.tar.xz -fL \
"https://mirrors.iu13.net/blender/release/${BLENDER_FOLDER}/blender-${BLENDER_VERSION}-linux-x64.tar.xz" && \
tar xf \
/tmp/blender.tar.xz -C \
/blender/ --strip-components=1 && \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' curl -sL https://mirrors.iu13.net/blender/source/ | awk -F'"|/"' '/blender-[0-9]*\\.[0-9]*\\.[0-9]*\\.tar\\.xz/ && !/md5sum/ {print $8}' | tail -1 | sed 's|blender-||' | sed 's|\\.tar\\.xz||' ''',
script: ''' curl -s https://projects.blender.org/api/v1/repos/blender/blender/tags | jq -r '.[] | select(.name | contains("-rc") | not) | .name' | sed 's|^v||g' | sort -rV | head -1 ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}
Expand Down
3 changes: 1 addition & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# jenkins variables
project_name: docker-blender
external_type: na
custom_version_command: |-
curl -sL https://mirrors.iu13.net/blender/source/ | awk -F'"|/"' '/blender-[0-9]*\\.[0-9]*\\.[0-9]*\\.tar\\.xz/ && !/md5sum/ {print $8}' | tail -1 | sed 's|blender-||' | sed 's|\\.tar\\.xz||'
custom_version_command: "curl -s https://projects.blender.org/api/v1/repos/blender/blender/tags | jq -r '.[] | select(.name | contains(\"-rc\") | not) | .name' | sed 's|^v||g' | sort -rV | head -1"
release_type: stable
release_tag: latest
ls_branch: master
Expand Down
Loading