Skip to content

Commit

Permalink
Merge branch 'master' into 1.1.0-release
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier authored Sep 25, 2024
2 parents d154bc6 + d739a7b commit 9287689
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # Check for GitHub Actions updates
directory: "/" # The root directory where the Ansible role is located
schedule:
interval: "monthly" # Check for updates monthly
commit-message:
prefix: "[ci] "
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Run sh-checker
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
uses: luizm/action-sh-checker@v0.4.0
uses: luizm/action-sh-checker@v0.9.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand All @@ -62,7 +62,7 @@ jobs:

- name: Cache OpenWrt dependencies
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-openwisp-config-dependencies
with:
Expand Down
5 changes: 4 additions & 1 deletion openwisp-config/files/openwisp.agent
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,10 @@ perform_default_test() {
fi
done
rm $TEST_CHECKSUM
return $result
# "$result" contains the exit code (integer),
# hence does not required to be wrapped in quotes.
# shellcheck disable=SC2086
return "$result"
}

# stores unmanaged configuration sections that will be merged
Expand Down

0 comments on commit 9287689

Please sign in to comment.