diff --git a/gh-actions/common/build-debian/action.yml b/gh-actions/common/build-debian/action.yml index a912bfeb..82f9c9aa 100644 --- a/gh-actions/common/build-debian/action.yml +++ b/gh-actions/common/build-debian/action.yml @@ -43,12 +43,14 @@ runs: steps: - name: Set up source package build shell: bash + env: + DEBIAN_FRONTEND: noninteractive run: | set -eu echo "::group::Install devscripts" - DEBIAN_FRONTEND=noninteractive sudo apt update - DEBIAN_FRONTEND=noninteractive sudo apt install -y devscripts + sudo apt update + sudo apt install -y devscripts echo "::endgroup::" echo "::group::Append commit SHA to local version" diff --git a/gh-actions/go/code-sanity/action.yaml b/gh-actions/go/code-sanity/action.yaml index 305bc8f9..25acbada 100644 --- a/gh-actions/go/code-sanity/action.yaml +++ b/gh-actions/go/code-sanity/action.yaml @@ -27,14 +27,16 @@ runs: cache: false - name: Set up jq shell: bash + env: + DEBIAN_FRONTEND: noninteractive run: | echo "::group::Download jq" if [ "${{runner.os}}" = "Windows" ]; then winget.exe install jqlang.jq --accept-source-agreements --accept-package-agreements --silent --verbose || true else - sudo --version &> /dev/null && SUDO="sudo" || SUDO="" - DEBIAN_FRONTEND=noninteractive $SUDO apt update - DEBIAN_FRONTEND=noninteractive $SUDO apt install jq + SUDO=$(command -v sudo || true) + $SUDO apt update + $SUDO apt install jq fi echo "::endgroup::" jq --version @@ -114,7 +116,7 @@ runs: # A terrible workaround for https://github.com/golangci/golangci-lint-action/issues/135 # Avoid using sudo (it is unavailable in docker) - sudo --version &> /dev/null && SUDO="sudo" || SUDO="" + SUDO=$(command -v sudo || true) $SUDO chmod -R +w ../../../go/ - name: Code formatting, vet, static checker Security…