diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml index 45d27cffe630ed2acd8d5ce84ca91347875d186d..5aa9ff6605abbecfd5c97de4735d2e4aa109318f 100644 --- a/.github/actions/environment/action.yml +++ b/.github/actions/environment/action.yml @@ -21,8 +21,7 @@ runs: # run from it. So running it only outside of docker container. # Also on local hosts, like that we use for 'freebsd' workflow # testing, 'sudo' not acceptable outside of 'freebsd' virtual - # machine and to avoid of hangs let's check sudo run ability - # with command like 'timeout 2 sudo ls /sbin/swapoff'. + # machine and to avoid of hangs let's run it with '-n' flag. # NOTE: To switch off swap from inside github 'container' tag # additional memory flags should be added to its 'options' tag: # options: '--memory=<some value, like 7G> --memory-swap=<the same value as for memory option>' @@ -30,7 +29,7 @@ runs: echo "Check initial swap memory values:" free fi - if timeout 2 sudo ls /sbin/swapoff ; then + if sudo -n ls /sbin/swapoff ; then echo "Verified that 'sudo' enabled, switching off swap ..." sudo /sbin/swapoff -a || echo "'swapoff' command failed, but failure is acceptable from inside the container" if [ -e /proc/meminfo ] ; then diff --git a/.github/actions/send-telegram-notify/action.yml b/.github/actions/send-telegram-notify/action.yml index 9565b8fe8f85014a3c3d4328e7fa00842c5c9928..a5de86ca168ab64ff2cdc3791c25c47d34a7ef51 100644 --- a/.github/actions/send-telegram-notify/action.yml +++ b/.github/actions/send-telegram-notify/action.yml @@ -30,8 +30,8 @@ runs: shell: bash # get job id number - run: | - apt update ||: - apt install -y jq ||: + sudo -n apt update -y ||: + sudo -n apt install -y jq ||: echo 'JOB_ID<<EOF' >> $GITHUB_ENV curl -s https://api.github.com/repos/tarantool/tarantool/actions/runs/${{ github.run_id }}/jobs | jq -r '.jobs[0].id' | tee -a $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV