From 230c52583cf3f4529936f697eaf7d880bf067360 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 5 Mar 2025 17:03:24 -0500 Subject: [PATCH] fix artifact uploader --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/publish_binaries.yml | 5 ++++- Jenkinsfile | 8 ++++++-- 8 files changed, 10 insertions(+), 3 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/publish_binaries.yml b/.github/workflows/publish_binaries.yml index d000cfc..939872c 100644 --- a/.github/workflows/publish_binaries.yml +++ b/.github/workflows/publish_binaries.yml @@ -9,6 +9,9 @@ jobs: publish-binaries: runs-on: ubuntu-latest steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Retrieve and upload artifacts run: | mkdir -p ./artifacts/amd64 ./artifacts/arm64 @@ -22,7 +25,7 @@ jobs: -H "Content-Type: application/octet-stream" \ "https://uploads.github.com/repos/linuxserver/docker-python/releases/${{ github.event.release.id }}/assets?name=python-amd64.tar.gz" \ --data-binary "@python-amd64.tar.gz" - docker create --name arm64 ghcr.io/linuxserver/python:arm64v8-${{ github.event.release.tag_name }} blah + docker create --name arm64 --platfrom=linux/arm64 ghcr.io/linuxserver/python:arm64v8-${{ github.event.release.tag_name }} blah docker cp arm64:/usr/local/. ./artifacts/arm64/ tar -czvf python-arm64.tar.gz -C ./artifacts/arm64/ . echo "**** Uploading arm64 tarball ****" diff --git a/Jenkinsfile b/Jenkinsfile index 3c9b966..560a385 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -687,7 +689,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1034,6 +1037,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() }