From 7c7c1f569b0015b858f2a66432a8a0f588e45328 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Mon, 18 Nov 2024 07:51:18 +0000 Subject: [PATCH] Fixed lint errors In preparation for upgrade to Ansible Lint 24.10.0. --- .github/dependabot.yml | 10 +++++----- vars/main.yml | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 750ddbf..d10eb2a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: weekly - day: saturday + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + day: saturday diff --git a/vars/main.yml b/vars/main.yml index 2d20236..8685609 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,7 +1,10 @@ # code: language=ansible --- # Java Adoptium release -java_release: "{{ java_version | string | regex_search('^((?:[0-9]+\\.)*)([0-9]+)$') | ternary('[' + (java_version | string) + ',' + (java_version | string | regex_replace('^((?:[0-9]+\\.)*)([0-9]+)$', '\\1')) + (((java_version | string | regex_replace('^((?:[0-9]+\\.)*)([0-9]+)$', '\\2') | int) + 1) | string) + ')', '[' + java_version + ',' + java_version + '.1)') }}" +java_release: "{{ java_version | string | regex_search('^((?:[0-9]+\\.)*)([0-9]+)$') | ternary(\ + '[' + (java_version | string) + ',' + (java_version | string | regex_replace('^((?:[0-9]+\\.)*)([0-9]+)$', '\\1')) + \ + (((java_version | string | regex_replace('^((?:[0-9]+\\.)*)([0-9]+)$', '\\2') | int) + 1) | string) + ')', \ + '[' + java_version + ',' + java_version + '.1)') }}" # The root folder of this Java installation java_home: '{{ java_install_dir }}/{{ java_release_name }}' @@ -10,7 +13,8 @@ java_home: '{{ java_install_dir }}/{{ java_release_name }}' java_api_server: 'https://api.adoptium.net' # The URL for the Adoptium API requests -java_api_request: "{{ java_api_server }}/v3/assets/version/{{ java_release | urlencode }}?jvm_impl=hotspot&os={{ java_os }}&architecture={{ java_arch }}&heap_size={{ java_heap_size }}&image_type=jdk&project=jdk&release_type=ga&page_size=1&sort_order=DESC&vendor=adoptium" +java_api_request: "{{ java_api_server }}/v3/assets/version/{{ java_release | urlencode }}?jvm_impl=hotspot&os={{ java_os }}&architecture={{ java_arch }}\ + &heap_size={{ java_heap_size }}&image_type=jdk&project=jdk&release_type=ga&page_size=1&sort_order=DESC&vendor=adoptium" # Operating System java_os: linux