diff --git a/ansible/roles/remove-old-ecs-pr-deploys/tasks/main.yml b/ansible/roles/remove-old-ecs-pr-deploys/tasks/main.yml index 0dd90a0fc..6aa670d08 100644 --- a/ansible/roles/remove-old-ecs-pr-deploys/tasks/main.yml +++ b/ansible/roles/remove-old-ecs-pr-deploys/tasks/main.yml @@ -34,7 +34,7 @@ terraform_lock_timeout_mins: 0 - name: maybe remove deployment - include: remove-ecs-deployment.yml + include_tasks: remove-ecs-deployment.yml with_list: "{{ ns_service_tuples }}" loop_control: loop_var: ns_service_tuple diff --git a/azure/cleanup-ecs-pr-proxies.yml b/azure/cleanup-ecs-pr-proxies.yml index 20a721c73..ddf1f7572 100644 --- a/azure/cleanup-ecs-pr-proxies.yml +++ b/azure/cleanup-ecs-pr-proxies.yml @@ -60,6 +60,26 @@ jobs: debug: true displayName: cache utils pre-requisites + - bash: | + PATCH=$(curl -s https://api.github.com/repos/actions/python-versions/releases \ + | jq -r '[.[] | .tag_name | select(startswith("3.13"))] | .[]' \ + | sort -V | tail -n 1 | cut -d- -f1) + echo "Resolved latest python version: $PATCH" + echo "##vso[task.setvariable variable=LD_LIBRARY_PATH;]/agent/_work/_tool/Python/${PATCH}/x64/lib/" + displayName: 'Query and set python tool cache path' + + - task: UsePythonVersion@0 + name: UsePy + displayName: "Use Python 3.13" + inputs: + versionSpec: 3.13 + + - bash: | + echo "Checking the python version in use to set LD_LIBRARY_PATH" + echo "Python location: $(UsePy.pythonLocation)" + echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(UsePy.pythonLocation)/lib" + displayName: 'Set LD_LIBRARY_PATH' + - bash: | make install displayName: install dependencies diff --git a/poetry.lock b/poetry.lock index 868e336f4..0c03f19ff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -289,6 +289,21 @@ files = [ {file = "charset_normalizer-3.4.1.tar.gz", hash = "sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3"}, ] +[[package]] +name = "click" +version = "8.3.1" +description = "Composable command line interface toolkit" +optional = false +python-versions = ">=3.10" +groups = ["main"] +files = [ + {file = "click-8.3.1-py3-none-any.whl", hash = "sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6"}, + {file = "click-8.3.1.tar.gz", hash = "sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + [[package]] name = "colorama" version = "0.4.6" @@ -1425,4 +1440,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.1" python-versions = "^3.13" -content-hash = "141fb8c250698df38381f7d588951364b99c53f1ebdd3344ea9a3966227c1fdc" +content-hash = "16fe4f55ce75508068564526b334a8963cdee9cbfdac5e944d8a2df3a8da84db" diff --git a/pyproject.toml b/pyproject.toml index ba5b7d095..25c626d75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ boto3 = "^1.34.0" ansible-core = "^2.19.4" urllib3 = "^2.5.0" cryptography = "44.0.1" +click="^8.1.2" [poetry.group.dev.dependencies] ansible-lint = "^6.0"