From 29cd2d2bdb55abea3b4c10da83846539013ea1b6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 8 Feb 2025 21:24:54 +0200 Subject: [PATCH] Update GH actions --- .github/workflows/docs.yml | 10 +++++----- docs | 2 +- tests/commands/pkg/test_uninstall.py | 9 +++++++-- tests/commands/pkg/test_update.py | 28 +++++++++++----------------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4404ad54..264a7e5c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: with: submodules: "recursive" - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" - name: Install dependencies @@ -40,7 +40,7 @@ jobs: - name: Save artifact if: ${{ github.event_name == 'push' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs path: ./docs.tar.gz @@ -57,7 +57,7 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: docs - name: Unpack artifact @@ -65,7 +65,7 @@ jobs: mkdir ./${{ env.LATEST_DOCS_DIR }} tar -xzf ./docs.tar.gz -C ./${{ env.LATEST_DOCS_DIR }} - name: Delete Artifact - uses: geekyeggo/delete-artifact@v2 + uses: geekyeggo/delete-artifact@v5 with: name: docs - name: Select Docs type @@ -101,7 +101,7 @@ jobs: exit 1 fi - name: Deploy to Github Pages - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: personal_token: ${{ secrets.DEPLOY_GH_DOCS_TOKEN }} external_repository: ${{ env.DOCS_REPO }} diff --git a/docs b/docs index 2a5ebc47..cfbb76a1 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 2a5ebc47a7f2395d842fbec75cb7dac6266a3121 +Subproject commit cfbb76a119831b3da8bcd843fd42703eba5ee3ee diff --git a/tests/commands/pkg/test_uninstall.py b/tests/commands/pkg/test_uninstall.py index 6a759fbc..0d854bc3 100644 --- a/tests/commands/pkg/test_uninstall.py +++ b/tests/commands/pkg/test_uninstall.py @@ -58,12 +58,14 @@ def test_global_packages( validate_cliresult(result) assert pkgs_to_names(LibraryPackageManager().get_installed()) == [ "ArduinoJson", + "Async TCP", "AsyncMqttClient", "AsyncTCP", + "AsyncTCP_RP2040W", "Bounce2", "ESP Async WebServer", "ESPAsyncTCP", - "ESPAsyncTCP", + "ESPAsyncTCP-esphome", "Homie", ] # uninstall all deps @@ -96,12 +98,14 @@ def test_global_packages( validate_cliresult(result) assert pkgs_to_names(LibraryPackageManager().get_installed()) == [ "ArduinoJson", + "Async TCP", "AsyncMqttClient", "AsyncTCP", + "AsyncTCP_RP2040W", "Bounce2", "ESP Async WebServer", "ESPAsyncTCP", - "ESPAsyncTCP", + "ESPAsyncTCP-esphome", ] # remove specific dependency result = clirunner.invoke( @@ -116,6 +120,7 @@ def test_global_packages( assert pkgs_to_names(LibraryPackageManager().get_installed()) == [ "ArduinoJson", "AsyncMqttClient", + "AsyncTCP", "Bounce2", "ESPAsyncTCP", ] diff --git a/tests/commands/pkg/test_update.py b/tests/commands/pkg/test_update.py index 4ee4366a..71f5dbf3 100644 --- a/tests/commands/pkg/test_update.py +++ b/tests/commands/pkg/test_update.py @@ -34,7 +34,7 @@ PROJECT_OUTDATED_CONFIG_TPL = """ platform = platformio/atmelavr@^2 framework = arduino board = attiny88 -lib_deps = milesburton/DallasTemperature@^3.8.0 +lib_deps = milesburton/DallasTemperature@^3.9.1 """ PROJECT_UPDATED_CONFIG_TPL = """ @@ -42,7 +42,7 @@ PROJECT_UPDATED_CONFIG_TPL = """ platform = platformio/atmelavr@<4 framework = arduino board = attiny88 -lib_deps = milesburton/DallasTemperature@^3.8.0 +lib_deps = milesburton/DallasTemperature@^3.9.1 """ @@ -179,7 +179,7 @@ def test_project( PackageSpec("toolchain-atmelavr@1.50400.190710"), ] assert config.get("env:devkit", "lib_deps") == [ - "milesburton/DallasTemperature@^3.8.0" + "milesburton/DallasTemperature@^3.9.1" ] # update packages @@ -195,10 +195,7 @@ def test_project( assert pkgs[0].metadata.name == "atmelavr" assert pkgs[0].metadata.version.major == 3 assert pkgs_to_specs(lm.get_installed()) == [ - PackageSpec( - "DallasTemperature@%s" - % get_pkg_latest_version("milesburton/DallasTemperature") - ), + PackageSpec("DallasTemperature@3.11.0"), PackageSpec( "OneWire@%s" % get_pkg_latest_version("paulstoffregen/OneWire") ), @@ -210,7 +207,7 @@ def test_project( PackageSpec("toolchain-atmelavr@1.50400.190710"), ] assert config.get("env:devkit", "lib_deps") == [ - "milesburton/DallasTemperature@^3.8.0" + "milesburton/DallasTemperature@^3.9.1" ] # update again @@ -230,7 +227,7 @@ def test_custom_project_libraries( project_dir = tmp_path / "project" project_dir.mkdir() (project_dir / "platformio.ini").write_text(PROJECT_OUTDATED_CONFIG_TPL) - spec = "milesburton/DallasTemperature@^3.8.0" + spec = "milesburton/DallasTemperature@^3.9.1" result = clirunner.invoke( package_install_cmd, ["-d", str(project_dir), "-e", "devkit", "-l", spec], @@ -251,15 +248,15 @@ def test_custom_project_libraries( # update package result = clirunner.invoke( package_update_cmd, - ["-e", "devkit", "-l", "milesburton/DallasTemperature@^3.8.0"], + ["-e", "devkit", "-l", "milesburton/DallasTemperature@^3.9.1"], ) assert ProjectConfig().get("env:devkit", "lib_deps") == [ - "milesburton/DallasTemperature@^3.8.0" + "milesburton/DallasTemperature@^3.9.1" ] # try again result = clirunner.invoke( package_update_cmd, - ["-e", "devkit", "-l", "milesburton/DallasTemperature@^3.8.0"], + ["-e", "devkit", "-l", "milesburton/DallasTemperature@^3.9.1"], ) validate_cliresult(result) assert "Already up-to-date." in result.output @@ -276,16 +273,13 @@ def test_custom_project_libraries( os.path.join(config.get("platformio", "libdeps_dir"), "devkit") ) assert pkgs_to_specs(lm.get_installed()) == [ - PackageSpec( - "DallasTemperature@%s" - % get_pkg_latest_version("milesburton/DallasTemperature") - ), + PackageSpec("DallasTemperature@3.11.0"), PackageSpec( "OneWire@%s" % get_pkg_latest_version("paulstoffregen/OneWire") ), ] assert config.get("env:devkit", "lib_deps") == [ - "milesburton/DallasTemperature@^3.8.0" + "milesburton/DallasTemperature@^3.9.1" ] # unknown libraries