Skip to content

Commit 0864dd2

Browse files
committed
fix artifact uploader and repush older version
1 parent cfd1c6c commit 0864dd2

File tree

10 files changed

+13
-6
lines changed

10 files changed

+13
-6
lines changed

.editorconfig

100755100644
File mode changed.

.github/CONTRIBUTING.md

100755100644
File mode changed.

.github/FUNDING.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/config.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2727
echo "> External trigger running off of alpine321 branch. To disable this trigger, add \`python_alpine321\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2828
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
29-
EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1)
29+
EXT_RELEASE=$(echo 3.13.1)
3030
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3131
if grep -q "^python_alpine321_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3232
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

.github/workflows/publish_binaries.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ jobs:
99
publish-binaries:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Set up QEMU
13+
uses: docker/setup-qemu-action@v3
14+
1215
- name: Retrieve and upload artifacts
1316
run: |
1417
mkdir -p ./artifacts/amd64 ./artifacts/arm64
@@ -22,7 +25,7 @@ jobs:
2225
-H "Content-Type: application/octet-stream" \
2326
"https://uploads.github.com/repos/linuxserver/docker-python/releases/${{ github.event.release.id }}/assets?name=python-amd64.tar.gz" \
2427
--data-binary "@python-amd64.tar.gz"
25-
docker create --name arm64 ghcr.io/linuxserver/python:arm64v8-${{ github.event.release.tag_name }} blah
28+
docker create --name arm64 --platform=linux/arm64 ghcr.io/linuxserver/python:arm64v8-${{ github.event.release.tag_name }} blah
2629
docker cp arm64:/usr/local/. ./artifacts/arm64/
2730
tar -czvf python-arm64.tar.gz -C ./artifacts/arm64/ .
2831
echo "**** Uploading arm64 tarball ****"

Jenkinsfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ pipeline {
7070
fi
7171
done
7272
fi
73-
docker system prune -f --volumes || : '''
73+
docker system prune -f --volumes || :
74+
docker image prune -af || :
75+
'''
7476
script{
7577
env.EXIT_STATUS = ''
7678
env.LS_RELEASE = sh(
@@ -141,7 +143,7 @@ pipeline {
141143
steps{
142144
script{
143145
env.EXT_RELEASE = sh(
144-
script: ''' curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1 ''',
146+
script: ''' echo 3.13.1 ''',
145147
returnStdout: true).trim()
146148
env.RELEASE_LINK = 'custom_command'
147149
}
@@ -687,7 +689,8 @@ pipeline {
687689
if [[ -n "${containers}" ]]; then
688690
docker stop ${containers}
689691
fi
690-
docker system prune -af --volumes || :
692+
docker system prune -f --volumes || :
693+
docker image prune -af || :
691694
'''
692695
}
693696
}
@@ -1034,6 +1037,7 @@ EOF
10341037
done
10351038
fi
10361039
docker system prune -f --volumes || :
1040+
docker image prune -af || :
10371041
'''
10381042
cleanWs()
10391043
}

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-python
55
external_type: na
6-
custom_version_command: "curl -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains(\"rc\") or contains(\"a\") or contains(\"b\") | not) | .name' | sed 's|^v||g' | sort -rV | head -1"
6+
custom_version_command: "echo 3.13.1"
77
release_type: stable
88
release_tag: alpine321
99
ls_branch: alpine321

0 commit comments

Comments
 (0)