Skip to content

Commit

Permalink
Merge remote-tracking branch 'github-kicksecure/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
adrelanos committed Aug 18, 2024
2 parents ea41722 + b9caca5 commit c40a30f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions usr/share/usability-misc/dist-installer-cli-standalone
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c40a30f

Please sign in to comment.