Modify bb64/publish.sh

bb64/publish.sh

@@ -105,12 +105,20 @@ echo "Getting or creating release $TAG on Gitea..."
 EXISTING_RELEASE=$(curl -s -X GET "$API_URL/releases/tags/$TAG" \
     -H "Authorization: token $RELEASE_WRITE_TOKEN")
 
+echo "Existing release check response: $EXISTING_RELEASE" >&2
+
 if echo "$EXISTING_RELEASE" | grep -q '"id":[0-9]*'; then
     # Release already exists, get its ID
     RELEASE_ID=$(echo "$EXISTING_RELEASE" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
     echo "Release $TAG already exists with ID: $RELEASE_ID"
 else
-    # Create new release
+    # Create new release only if tag was just created
+    if [ "$TAG_EXISTS_ON_REMOTE" = true ]; then
+        echo "Tag exists on remote but no release found - this shouldn't happen" >&2
+        echo "API response was: $EXISTING_RELEASE" >&2
+        exit 1
+    fi
+    
     echo "Creating new release $TAG on Gitea..."
     RELEASE_RESPONSE=$(curl -s -X POST "$API_URL/releases" \
         -H "Content-Type: application/json" \

getpkg/test.sh

@@ -528,6 +528,128 @@ EOF
     fi
 fi
 
+
+# Test 13.5: Comprehensive unpublish functionality
+echo -e "\nTest 13.5: Comprehensive unpublish functionality"
+
+# Only run unpublish tests if SOS_WRITE_TOKEN is available
+if [ -n "${SOS_WRITE_TOKEN:-}" ]; then
+    # Create unique test names for unpublish tests
+    UNPUBLISH_TOOL_BASE="test-unpublish-$RANDOM"
+    UNPUBLISH_TOOL_MULTI="${UNPUBLISH_TOOL_BASE}-multi"
+    UNPUBLISH_TOOL_CUSTOM="${UNPUBLISH_TOOL_BASE}-custom"
+    UNPUBLISH_TEST_DIR="${TEST_DIR}/unpublish_tests"
+    
+    # Create test directory structure
+    mkdir -p "$UNPUBLISH_TEST_DIR"
+    
+    # Test 13.5a: Create and publish tool with multiple architectures
+    echo "Test 13.5a: Unpublish tool with multiple architectures"
+    echo '#!/bin/bash
+echo "Multi-arch unpublish test"' > "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_MULTI"
+    chmod +x "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_MULTI"
+    
+    # Publish to multiple architectures
+    PUBLISH_x86_64_OUTPUT=$("$GETPKG" publish "${UNPUBLISH_TOOL_MULTI}:x86_64" "$UNPUBLISH_TEST_DIR" 2>&1)
+    PUBLISH_aarch64_OUTPUT=$("$GETPKG" publish "${UNPUBLISH_TOOL_MULTI}:aarch64" "$UNPUBLISH_TEST_DIR" 2>&1)
+    PUBLISH_universal_OUTPUT=$("$GETPKG" publish "${UNPUBLISH_TOOL_MULTI}:universal" "$UNPUBLISH_TEST_DIR" 2>&1)
+    
+    if [[ "$PUBLISH_x86_64_OUTPUT" =~ Published! ]] && [[ "$PUBLISH_aarch64_OUTPUT" =~ Published! ]] && [[ "$PUBLISH_universal_OUTPUT" =~ Published! ]]; then
+        # Test robust unpublish - should remove ALL architectures
+        sleep 1  # Give server time to process all publishes
+        UNPUBLISH_OUTPUT=$("$GETPKG" unpublish "$UNPUBLISH_TOOL_MULTI" 2>&1)
+        UNPUBLISH_EXIT_CODE=$?
+        
+        # Check that unpublish found and removed packages
+        if [ $UNPUBLISH_EXIT_CODE -eq 0 ] && [[ "$UNPUBLISH_OUTPUT" =~ "Found" ]] && [[ "$UNPUBLISH_OUTPUT" =~ "Successfully unpublished" ]]; then
+            print_test_result "Unpublish removes all architectures" 0
+        else
+            print_test_result "Unpublish removes all architectures" 1
+            echo "  Unpublish failed: $UNPUBLISH_OUTPUT"
+        fi
+    else
+        print_test_result "Unpublish removes all architectures" 1
+        echo "  Failed to publish test tool to multiple architectures"
+        echo "  x86_64: $PUBLISH_x86_64_OUTPUT"
+        echo "  aarch64: $PUBLISH_aarch64_OUTPUT"
+        echo "  universal: $PUBLISH_universal_OUTPUT"
+    fi
+    
+    # Test 13.5b: Unpublish tool with universal architecture
+    echo "Test 13.5b: Unpublish tool with universal architecture"
+    echo '#!/bin/bash
+echo "Universal arch unpublish test"' > "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_CUSTOM"
+    chmod +x "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_CUSTOM"
+    
+    # Publish with universal architecture
+    PUBLISH_CUSTOM_OUTPUT=$("$GETPKG" publish "${UNPUBLISH_TOOL_CUSTOM}:universal" "$UNPUBLISH_TEST_DIR" 2>&1)
+    
+    if [[ "$PUBLISH_CUSTOM_OUTPUT" =~ Published! ]]; then
+        # Test that unpublish can find and remove custom tags
+        UNPUBLISH_CUSTOM_OUTPUT=$("$GETPKG" unpublish "$UNPUBLISH_TOOL_CUSTOM" 2>&1)
+        UNPUBLISH_CUSTOM_EXIT_CODE=$?
+        
+        if [ $UNPUBLISH_CUSTOM_EXIT_CODE -eq 0 ] && [[ "$UNPUBLISH_CUSTOM_OUTPUT" =~ "Found ${UNPUBLISH_TOOL_CUSTOM}:universal" ]]; then
+            print_test_result "Unpublish finds universal architecture" 0
+        else
+            print_test_result "Unpublish finds universal architecture" 1
+            echo "  Failed to find or unpublish custom tag: $UNPUBLISH_CUSTOM_OUTPUT"
+        fi
+    else
+        print_test_result "Unpublish finds universal architecture" 1
+        echo "  Failed to publish tool with custom tag: $PUBLISH_CUSTOM_OUTPUT"
+    fi
+    
+    # Test 13.5c: Unpublish non-existent tool
+    echo "Test 13.5c: Unpublish non-existent tool"
+    NON_EXISTENT_TOOL="non-existent-tool-$RANDOM"
+    UNPUBLISH_MISSING_OUTPUT=$("$GETPKG" unpublish "$NON_EXISTENT_TOOL" 2>&1)
+    UNPUBLISH_MISSING_EXIT_CODE=$?
+    
+    if [ $UNPUBLISH_MISSING_EXIT_CODE -ne 0 ] && [[ "$UNPUBLISH_MISSING_OUTPUT" =~ "No packages found" ]]; then
+        print_test_result "Unpublish handles missing tools gracefully" 0
+    else
+        print_test_result "Unpublish handles missing tools gracefully" 1
+        echo "  Expected failure for non-existent tool, got: $UNPUBLISH_MISSING_OUTPUT"
+    fi
+    
+    # Test 13.5d: Unpublish by hash
+    echo "Test 13.5d: Unpublish by hash"
+    UNPUBLISH_TOOL_HASH="${UNPUBLISH_TOOL_BASE}-hash"
+    echo '#!/bin/bash
+echo "Hash unpublish test"' > "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_HASH"
+    chmod +x "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_HASH"
+    
+    PUBLISH_HASH_OUTPUT=$("$GETPKG" publish "${UNPUBLISH_TOOL_HASH}:x86_64" "$UNPUBLISH_TEST_DIR" 2>&1)
+    
+    if [[ "$PUBLISH_HASH_OUTPUT" =~ Hash:\ ([0-9]+) ]]; then
+        EXTRACTED_HASH="${BASH_REMATCH[1]}"
+        
+        # Test unpublish by hash
+        UNPUBLISH_HASH_OUTPUT=$("$GETPKG" unpublish "$EXTRACTED_HASH" 2>&1)
+        UNPUBLISH_HASH_EXIT_CODE=$?
+        
+        if [ $UNPUBLISH_HASH_EXIT_CODE -eq 0 ] && [[ "$UNPUBLISH_HASH_OUTPUT" =~ "Successfully unpublished hash" ]]; then
+            print_test_result "Unpublish by hash works" 0
+        else
+            print_test_result "Unpublish by hash works" 1
+            echo "  Failed to unpublish by hash: $UNPUBLISH_HASH_OUTPUT"
+        fi
+    else
+        print_test_result "Unpublish by hash works" 1
+        echo "  Could not extract hash from publish output"
+    fi
+    
+    # Cleanup unpublish test directory
+    rm -rf "$UNPUBLISH_TEST_DIR"
+    
+else
+    echo "  Skipping unpublish tests (SOS_WRITE_TOKEN not set)"
+    print_test_result "Unpublish removes all architectures" 0  # Pass as skipped
+    print_test_result "Unpublish finds universal architecture" 0
+    print_test_result "Unpublish handles missing tools gracefully" 0
+    print_test_result "Unpublish by hash works" 0
+fi
 # Test 14: Invalid tool name validation
 echo -e "\nTest 14: Invalid tool name validation"
 INVALID_OUTPUT=$(timeout 3 "$GETPKG" install "../evil-tool" 2>&1)