From 5d62b100c1ad35441628f1ad123fa4971c3fa9f3 Mon Sep 17 00:00:00 2001 From: Nikita Rudenko Date: Sat, 21 Oct 2023 18:45:51 +0300 Subject: [PATCH] feat: add ubuntu 23.10 --- .github/workflows/workflow.yml | 2 +- inventory.yaml | 4 ++++ makefile | 12 +++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9033db1f..ef3cd01d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,7 +25,7 @@ jobs: ! (grep -oP "changed=\d+" __build__/log | grep -oPq "changed=[1-9]") strategy: matrix: - ubuntu_tag: ["22.04", "23.04"] + ubuntu_tag: ["22.04", "23.04", "23.10"] check_locahost: runs-on: ubuntu-22.04 diff --git a/inventory.yaml b/inventory.yaml index 037836f7..db1dcc19 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -15,3 +15,7 @@ all: ansible_connection: podman ansible_python_interpreter: auto_silent trusted: true + dotfiles_23.10: + ansible_connection: podman + ansible_python_interpreter: auto_silent + trusted: true diff --git a/makefile b/makefile index 9157a441..98aa4916 100644 --- a/makefile +++ b/makefile @@ -128,7 +128,7 @@ $(BUILD_DIR)/venv: $(BUILD_DIR)/python python3 -m venv $(BUILD_DIR)/venv PYTHON_INSTALLED != (command -v python3 &> /dev/null && command -v pip3 &> /dev/null) || echo "$(BUILD_DIR)/not_ready" -$(BUILD_DIR)/python: $(BUILD_DIR)/sudo $(PYTHON_INSTALLED) +$(BUILD_DIR)/python: $(BUILD_DIR)/sudo $(BUILD_DIR)/tzdata $(PYTHON_INSTALLED) if [[ -n "$(PYTHON_INSTALLED)" ]]; then \ sudo apt-get update && \ DEBIAN_FRONTEND=noninteractive sudo apt-get install --yes --no-install-recommends \ @@ -138,6 +138,16 @@ $(BUILD_DIR)/python: $(BUILD_DIR)/sudo $(PYTHON_INSTALLED) fi mkdir --parents $(BUILD_DIR) && touch $@ +TZDATA_INSTALLED != (command -v tzconfig &> /dev/null && command -v pip3 &> /dev/null) || echo "$(BUILD_DIR)/not_ready" +$(BUILD_DIR)/tzdata: $(BUILD_DIR)/sudo $(TZDATA_INSTALLED) + if [[ -n "$(TZDATA_INSTALLED)" ]]; then \ + sudo apt-get update && \ + DEBIAN_FRONTEND=noninteractive TZ=Europe/Moscow sudo apt-get install --yes --no-install-recommends \ + tzdata \ + ; \ + fi + mkdir --parents $(BUILD_DIR) && touch $@ + SUDO_INSTALLED != command -v sudo &> /dev/null || echo "$(BUILD_DIR)/not_ready" $(BUILD_DIR)/sudo: $(SUDO_INSTALLED) if [[ -n "$(SUDO_INSTALLED)" ]]; then \