From a7eb4d1a68e2d5b2d33783eb638fb8cb02529778 Mon Sep 17 00:00:00 2001 From: emil Date: Sun, 21 Jun 2026 13:18:54 +0000 Subject: [PATCH] GRM-34: fix: install git-cliff to user-writable dir and fix archlinux idempotence --- .gitea/workflows/publish.yml | 6 ++++-- .gitea/workflows/release.yml | 6 ++++-- ansible/roles/gitea-runner/tasks/rootless_docker.yml | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 13c1381..4d4d0e3 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -17,8 +17,10 @@ jobs: GIT_CLIFF_VERSION="2.13.0" URL="https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-gnu.tar.gz" curl -sL "$URL" | tar xz -C /tmp - mv "/tmp/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" /usr/local/bin/git-cliff - chmod +x /usr/local/bin/git-cliff + mkdir -p "$HOME/.local/bin" + mv "/tmp/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" "$HOME/.local/bin/git-cliff" + chmod +x "$HOME/.local/bin/git-cliff" + echo "$HOME/.local/bin" >> "$GITHUB_PATH" git-cliff --version - name: Install build tools run: | diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index f42b25b..6f68194 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -17,8 +17,10 @@ jobs: GIT_CLIFF_VERSION="2.13.0" URL="https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-gnu.tar.gz" curl -sL "$URL" | tar xz -C /tmp - mv "/tmp/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" /usr/local/bin/git-cliff - chmod +x /usr/local/bin/git-cliff + mkdir -p "$HOME/.local/bin" + mv "/tmp/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" "$HOME/.local/bin/git-cliff" + chmod +x "$HOME/.local/bin/git-cliff" + echo "$HOME/.local/bin" >> "$GITHUB_PATH" git-cliff --version - name: Install Python dependencies run: python3 -m pip install --break-system-packages requests python-dotenv click diff --git a/ansible/roles/gitea-runner/tasks/rootless_docker.yml b/ansible/roles/gitea-runner/tasks/rootless_docker.yml index ce12895..30a7457 100644 --- a/ansible/roles/gitea-runner/tasks/rootless_docker.yml +++ b/ansible/roles/gitea-runner/tasks/rootless_docker.yml @@ -45,6 +45,12 @@ state: present when: ansible_facts['os_family'] == 'Debian' +- name: Update pacman cache (Arch Linux) + community.general.pacman: + update_cache: true + when: ansible_facts['os_family'] == 'Archlinux' + changed_when: false + - name: Install rootless Docker dependencies (Arch Linux) community.general.pacman: name: @@ -54,7 +60,6 @@ - fuse-overlayfs - rsync state: present - update_cache: true when: ansible_facts['os_family'] == 'Archlinux' - name: Check if rootless Docker is already set up