From 5cbffb5235fb6acfff456c5136cfc9207eddc719 Mon Sep 17 00:00:00 2001 From: nyxnor Date: Fri, 16 Aug 2024 15:00:53 +0000 Subject: [PATCH 1/2] Fix shellcheck warnings --- usr/share/usability-misc/dist-installer-cli-standalone | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr/share/usability-misc/dist-installer-cli-standalone b/usr/share/usability-misc/dist-installer-cli-standalone index 7a45e60..ee743bf 100755 --- a/usr/share/usability-misc/dist-installer-cli-standalone +++ b/usr/share/usability-misc/dist-installer-cli-standalone @@ -1319,6 +1319,7 @@ check_upgrades_simulation() { true "INFO: No error found in upgrade_simulate_output output, ok." + # shellcheck disable=SC2086 if pkg_mngr_upgradable_check ${install_pkg_fasttrack_extra_args_maybe} ; then packages_upgradable=false else @@ -2079,6 +2080,7 @@ install_package_debian_common(){ ## Not using 'apt list --upgradable', because it is not the same as ## 'sudo apt-get dist-upgrade --target-release=bookworm-fasttrack'. ## It misses out on packages from "bookworm-fasttrack". + # shellcheck disable=SC2086 upgrade_check_output="$(root_cmd ${pkg_mngr_upgrade_check} "$@" 2>&1)" || true local upgrade_check_grep_output ## Counting both 'Inst' and 'Conf' is not an accurate counting. Will double count. But will also mean that From 027b61f68375ddfa46795431e78d76e329ac88d8 Mon Sep 17 00:00:00 2001 From: nyxnor Date: Fri, 16 Aug 2024 15:04:14 +0000 Subject: [PATCH 2/2] Update actions major version --- .github/workflows/builds.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a0ef323..f379644 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -15,8 +15,8 @@ jobs: builds: ${{ steps.filter.outputs.builds }} installer: ${{ steps.filter.outputs.installer }} steps: - - uses: actions/checkout@v3 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: | @@ -55,7 +55,7 @@ jobs: image: ${{ matrix.image }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: System Basic Packages run: | if command -v apt-get; then