From 6c851f0d2cb65a8e240c2306d629d0c6b2d1287f Mon Sep 17 00:00:00 2001 From: Slavey Karadzhov Date: Mon, 24 Jun 2024 11:19:40 +0200 Subject: [PATCH] Remove appveyor compatibility. --- .github/workflows/release.yml | 2 +- Sming/Arch/Host/Tools/install.sh | 6 ------ Tools/ci/install.sh | 7 ------- Tools/ci/testnotify.sh | 6 +----- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6eb7520fce..ef9127ad64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: approvers: slaff - name: Install xmlstarlet if: ${{ github.ref_type == 'tag' }} - run: sudo apt-get install -y xmlstarlet + run: sudo apt-get install -y jq xmlstarlet - name: Build docs if: ${{ github.ref_type == 'tag' }} run: | diff --git a/Sming/Arch/Host/Tools/install.sh b/Sming/Arch/Host/Tools/install.sh index 6417bdbc4a..151c667010 100755 --- a/Sming/Arch/Host/Tools/install.sh +++ b/Sming/Arch/Host/Tools/install.sh @@ -2,9 +2,3 @@ # # Host install.sh -# Required by deployment script -if [ -n "$APPVEYOR" ]; then - $PKG_INSTALL \ - jq \ - xmlstarlet -fi diff --git a/Tools/ci/install.sh b/Tools/ci/install.sh index a5a409deaf..d512d5bcd8 100755 --- a/Tools/ci/install.sh +++ b/Tools/ci/install.sh @@ -11,13 +11,6 @@ set -ex if [ -z "$SMING_TOOLS_PREINSTALLED" ]; then -# appveyor-specific -if [ -n "$APPVEYOR" ]; then - export PYTHON=$HOME/venv3.9/bin/python - export ESP32_PYTHON_PATH=$HOME/venv3.9/bin - source "$HOME/venv3.9/bin/activate" -fi - if [ "$BUILD_DOCS" = "true" ]; then INSTALL_OPTS="doc" else diff --git a/Tools/ci/testnotify.sh b/Tools/ci/testnotify.sh index c681e46964..e04b1820bb 100755 --- a/Tools/ci/testnotify.sh +++ b/Tools/ci/testnotify.sh @@ -38,10 +38,6 @@ case "$status" in ;; esac -if [ -n "$APPVEYOR" ]; then - appveyor $cmd "$testname" -Framework Sming -Filename "$MODULE" -Outcome $status -Duration $elapsedMillis -else - echo "TestNotify: $cmd $testname -Framework Sming -Filename $MODULE -Outcome $status -Duration $elapsedMillis" -fi +echo "TestNotify: $cmd $testname -Framework Sming -Filename $MODULE -Outcome $status -Duration $elapsedMillis" echo "$curNanos" > "$testfile"