diff --git a/.config/dictionary.txt b/.config/dictionary.txt index 8eb0f19ec..aa774f21c 100644 --- a/.config/dictionary.txt +++ b/.config/dictionary.txt @@ -1,10 +1,30 @@ +ALS +Anson +Containerfile +Dockal +FQCN +FQCNs +Florian +Launay +Maciążek +OSTYPE +Ondrej +PYTHONBREAKPOINT +PYTHONHOME +Pinkney +Pyenv +Sbarnea +Schwalm +Sorin +TLDR +Testenvs +Tomasz +Webviews aarch ajinkyau akira alefragnani alphanums -ALS -Anson autofix autoupdate backticks @@ -18,18 +38,17 @@ codespell codicon codicons commitlint -Containerfile contentmatch contentmatches copyfiles cygwin +cython dbaeumer dedupe depcheck deps devel direnv -Dockal dpkg eamodio endgroup @@ -39,9 +58,6 @@ eqeqeq esbenp extest fgierlinger -Florian -FQCN -FQCNs fredericgiquel ganeshrn githubcli @@ -55,14 +71,12 @@ jeinwag johndoe keyfile keyrings -Launay lextudio libyaml lightspeed liveserver loglevel lxml -Maciążek markdownlint maxlength mochawesome @@ -73,12 +87,9 @@ myuser noheading npmrc nsible -Ondrej -OSTYPE overridable ovsx parseable -Pinkney piptools pipx precheck @@ -87,20 +98,14 @@ preinstall priyamsahoo projectuser prsahoo -Pyenv pyparsing -PYTHONBREAKPOINT -PYTHONHOME reindent reindented relogin ritwickdey rulebooks -Sbarnea -Schwalm showformat simplejson -Sorin sourcemaps ssbarnea ssydoren @@ -108,14 +113,11 @@ stopendy suboptions sysninja taskfile -Testenvs testenv testhost testorg timonwong -TLDR tomaciazek -Tomasz towerhost tsbuildinfo tsdoc @@ -130,7 +132,6 @@ vscoss vsix vyos watsonx -Webviews webknjaz webpacked whitespaces diff --git a/.config/requirements.in b/.config/requirements.in index 776b06ef2..aaa89c230 100644 --- a/.config/requirements.in +++ b/.config/requirements.in @@ -1,3 +1,4 @@ +cython>=3.0.5; python_version >= "3.12" ansible-core>=2.13.0 ansible-lint>=6.8.7 mypy # used by vscode diff --git a/.gitignore b/.gitignore index 9adc216ee..de972b202 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ CHANGELOG.html !.yarn/versions .DS_Store .direnv +.tool-versions diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 1188377cd..5d00ee9bc 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -59,6 +59,10 @@ log() { echo >&2 -e "${prefix}${2}${NC}" } +is_podman_running() { + podman machine ls --format '{{.Name}} {{.Running}}' --noheading | grep podman-machine-default | grep true >/dev/null +} + if [ ! -d "$HOME/.local/bin" ] ; then log warning "Creating missing ~/.local/bin" mkdir -p "$HOME/.local/bin" @@ -330,7 +334,7 @@ if [[ "${OSTYPE:-}" == darwin* && "${SKIP_PODMAN:-}" != '1' ]]; then } podman machine ls --noheading log notice "Checking status of podman machine ($MACHTYPE)..." - podman machine ls --format '{{.Name}} {{.Running}}' --noheading | grep podman-machine-default | grep true || { + is_podman_running || { log warning "Podman machine not running, trying to start it..." # do not use full path as it varies based on architecture # https://github.com/containers/podman/issues/10824#issuecomment-1162392833 @@ -340,10 +344,12 @@ if [[ "${OSTYPE:-}" == darwin* && "${SKIP_PODMAN:-}" != '1' ]]; then else qemu-system-aarch64 -machine q35,accel=hvf:tcg -cpu host -display none INVALID_OPTION || true fi + podman machine start + # Waiting for machine to become available n=0 until [ "$n" -ge 5 ]; do log warning "Trying to start podman machine again ($n)..." - time podman machine start && break # substitute your command here + is_podman_running && break n=$((n+1)) sleep 15 done