From 7285dd44f3da21916ef8f46a5cc77f6ad9e82514 Mon Sep 17 00:00:00 2001 From: Evan Jarrett Date: Mon, 3 Nov 2025 17:16:44 -0600 Subject: [PATCH] fix --- .../workflows/release-credential-helper.yml | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.tangled/workflows/release-credential-helper.yml b/.tangled/workflows/release-credential-helper.yml index d15e003..891164e 100644 --- a/.tangled/workflows/release-credential-helper.yml +++ b/.tangled/workflows/release-credential-helper.yml @@ -17,6 +17,9 @@ dependencies: - goreleaser # For building multi-platform binaries - curl # Required by go generate for downloading vendor assets - gnugrep # Required for tag detection + - gnutar # Required for creating tarballs + - gzip # Required for compressing tarballs + - coreutils # Required for sha256sum # - goat # TODO: Add goat CLI for uploading to Tangled (if available in nixpkgs) environment: @@ -73,33 +76,41 @@ steps: cd dist - # Create tarballs for each platform (GoReleaser might already do this) + # Create tarballs for each platform + # GoReleaser creates directories like: credential-helper_{os}_{arch}_v{goversion} + # Darwin x86_64 - if [ -d "docker-credential-atcr_darwin_amd64_v1" ]; then + if [ -d "credential-helper_darwin_amd64_v1" ]; then tar czf "docker-credential-atcr_${VERSION_NO_V}_Darwin_x86_64.tar.gz" \ - -C docker-credential-atcr_darwin_amd64_v1 docker-credential-atcr + -C credential-helper_darwin_amd64_v1 docker-credential-atcr fi # Darwin arm64 - if [ -d "docker-credential-atcr_darwin_arm64" ]; then - tar czf "docker-credential-atcr_${VERSION_NO_V}_Darwin_arm64.tar.gz" \ - -C docker-credential-atcr_darwin_arm64 docker-credential-atcr - fi + for dir in credential-helper_darwin_arm64*; do + if [ -d "$dir" ]; then + tar czf "docker-credential-atcr_${VERSION_NO_V}_Darwin_arm64.tar.gz" \ + -C "$dir" docker-credential-atcr + break + fi + done # Linux x86_64 - if [ -d "docker-credential-atcr_linux_amd64_v1" ]; then + if [ -d "credential-helper_linux_amd64_v1" ]; then tar czf "docker-credential-atcr_${VERSION_NO_V}_Linux_x86_64.tar.gz" \ - -C docker-credential-atcr_linux_amd64_v1 docker-credential-atcr + -C credential-helper_linux_amd64_v1 docker-credential-atcr fi # Linux arm64 - if [ -d "docker-credential-atcr_linux_arm64" ]; then - tar czf "docker-credential-atcr_${VERSION_NO_V}_Linux_arm64.tar.gz" \ - -C docker-credential-atcr_linux_arm64 docker-credential-atcr - fi + for dir in credential-helper_linux_arm64*; do + if [ -d "$dir" ]; then + tar czf "docker-credential-atcr_${VERSION_NO_V}_Linux_arm64.tar.gz" \ + -C "$dir" docker-credential-atcr + break + fi + done echo "Created tarballs:" - ls -lh *.tar.gz + ls -lh *.tar.gz 2>/dev/null || echo "No tarballs created" - name: Upload to Tangled.org command: |