From d7964d3a781dcb4fc426596c5fd47d35dfeca0c5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Jun 2025 21:35:21 +1200 Subject: [PATCH] test: Update 3 files --- .gitea/workflows/BuildTestPublish.yaml | 2 +- buildtestpublish_all.sh | 10 ---------- getpkg/test.sh | 7 ++++--- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/BuildTestPublish.yaml b/.gitea/workflows/BuildTestPublish.yaml index 6cf95cc..69e8e72 100644 --- a/.gitea/workflows/BuildTestPublish.yaml +++ b/.gitea/workflows/BuildTestPublish.yaml @@ -26,7 +26,7 @@ jobs: password: ${{ secrets.DOCKER_PUSH_TOKEN }} - name: Build Test Publish All run: | - SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} ./buildtestpublish_all.sh --no-cache + SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} ./buildtestpublish_all.sh test-install-from-scratch: needs: [build] diff --git a/buildtestpublish_all.sh b/buildtestpublish_all.sh index de15d32..01c5ee6 100755 --- a/buildtestpublish_all.sh +++ b/buildtestpublish_all.sh @@ -2,16 +2,6 @@ set -uo pipefail # Remove -e to handle errors manually SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -# Parse command line arguments -NO_CACHE=false -if [[ "$*" == *"--no-cache"* ]]; then - NO_CACHE=true - export NO_CACHE -fi - -docker builder prune -f - - # Colors for output RED='\033[0;31m' GREEN='\033[0;32m' diff --git a/getpkg/test.sh b/getpkg/test.sh index 72f2806..a455691 100755 --- a/getpkg/test.sh +++ b/getpkg/test.sh @@ -455,12 +455,13 @@ EOF CONFIG_EXISTS=false TOOL_DIR_EXISTS=false SYMLINK_EXISTS=false - HELPER_SYMLINK_EXISTS=false + # HELPER_SYMLINK_EXISTS=false [ -f ~/.config/getpkg/"${TEST_UNINSTALL_TOOL}.json" ] && CONFIG_EXISTS=true [ -d ~/.getpkg/"$TEST_UNINSTALL_TOOL" ] && TOOL_DIR_EXISTS=true [ -L ~/.local/bin/getpkg/"$TEST_UNINSTALL_TOOL" ] && SYMLINK_EXISTS=true - [ -L ~/.local/bin/getpkg/"${TEST_UNINSTALL_TOOL}-helper" ] && HELPER_SYMLINK_EXISTS=true + # Check if helper symlink exists (not currently used in validation) + # [ -L ~/.local/bin/getpkg/"${TEST_UNINSTALL_TOOL}-helper" ] && HELPER_SYMLINK_EXISTS=true if $CONFIG_EXISTS && $TOOL_DIR_EXISTS && $SYMLINK_EXISTS; then # Now uninstall @@ -589,7 +590,7 @@ echo "Universal arch unpublish test"' > "$UNPUBLISH_TEST_DIR/$UNPUBLISH_TOOL_CUS 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 + 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