From f6257fdcd210bfd5f71ad3ace790ff2330d1606b Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Tue, 2 Jul 2024 18:39:07 +0200 Subject: [PATCH] Bump ansible and ansible-lint versions in CI --- .gitea/workflows/check.yaml | 5 ++-- ansible/playbooks/misc-sites.yaml | 2 +- .../checkout_static_sites/tasks/main.yaml | 4 +-- docker/docker/gitea/Dockerfile | 2 +- docker/docker/gitea/docker-compose.yaml | 4 +-- docker/docker/gitea/runner-config.yaml | 2 ++ docker/envs/gitea/.env | 26 +++++++++---------- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/check.yaml b/.gitea/workflows/check.yaml index 67de9e9..c67f039 100644 --- a/.gitea/workflows/check.yaml +++ b/.gitea/workflows/check.yaml @@ -2,14 +2,15 @@ name: Check on: [push] jobs: "Lint Ansible Files": - runs-on: ubuntu-22.04 + runs-on: node-22-bookworm steps: - run: apt-get update + - run: apt-get upgrade -y - run: apt-get install -y python3 python3-pip python3-venv - run: python3 --version - name: Check out repo uses: actions/checkout@v3 - run: python3 -m venv venv - - run: venv/bin/pip --disable-pip-version-check install ansible==7.2.0 ansible-lint==6.16.1 > /dev/null 2> /dev/null + - run: venv/bin/pip --disable-pip-version-check install ansible==9.6.0 ansible-lint==24.2.2 - run: venv/bin/ansible-lint -c .ansible-lint ansible # TODO: Reimplement ansible-play --check step from old drone config diff --git a/ansible/playbooks/misc-sites.yaml b/ansible/playbooks/misc-sites.yaml index 55af3cd..683e86f 100644 --- a/ansible/playbooks/misc-sites.yaml +++ b/ansible/playbooks/misc-sites.yaml @@ -6,7 +6,7 @@ ansible.builtin.include_role: name: checkout_static_sites vars: - checkout_static_sites: + checkout_static_sites_config: checkouts: - path: /home/paul/Sites/pbrinkmeier.de url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de diff --git a/ansible/roles/checkout_static_sites/tasks/main.yaml b/ansible/roles/checkout_static_sites/tasks/main.yaml index 5217987..dc1b072 100644 --- a/ansible/roles/checkout_static_sites/tasks/main.yaml +++ b/ansible/roles/checkout_static_sites/tasks/main.yaml @@ -7,7 +7,7 @@ mode: '0755' owner: "{{ item.owner }}" group: "{{ item.owner }}" - loop: "{{ checkout_static_sites.checkouts }}" + loop: "{{ checkout_static_sites_config.checkouts }}" - name: Check out static site repositories become: true become_user: "{{ item.owner }}" @@ -15,4 +15,4 @@ dest: "{{ item.path }}" repo: "{{ item.url }}" version: "{{ item.commit }}" - loop: "{{ checkout_static_sites.checkouts }}" + loop: "{{ checkout_static_sites_config.checkouts }}" diff --git a/docker/docker/gitea/Dockerfile b/docker/docker/gitea/Dockerfile index 5a02d6b..f7c8685 100644 --- a/docker/docker/gitea/Dockerfile +++ b/docker/docker/gitea/Dockerfile @@ -1,3 +1,3 @@ - FROM gitea/act_runner:0.2.5 + FROM gitea/act_runner:0.2.10 COPY runner-config.yaml /opt/runner-config.yaml diff --git a/docker/docker/gitea/docker-compose.yaml b/docker/docker/gitea/docker-compose.yaml index 89f62f1..f28263f 100644 --- a/docker/docker/gitea/docker-compose.yaml +++ b/docker/docker/gitea/docker-compose.yaml @@ -1,6 +1,6 @@ services: gitea: - image: gitea/gitea:1.20.3 + image: gitea/gitea:1.21.11 restart: unless-stopped environment: # Ref: https://docs.gitea.io/en-us/config-cheat-sheet @@ -64,7 +64,7 @@ services: - /var/lib/pbri/docker/gitea_db:/var/lib/postgresql/data gitea_runner: - image: pbrinkmeier/act_runner:0.2.5 + image: pbrinkmeier/act_runner:0.2.10 build: . restart: unless-stopped environment: diff --git a/docker/docker/gitea/runner-config.yaml b/docker/docker/gitea/runner-config.yaml index bfa8c9a..11ada3f 100644 --- a/docker/docker/gitea/runner-config.yaml +++ b/docker/docker/gitea/runner-config.yaml @@ -32,6 +32,8 @@ runner: # ubuntu:22.04 here is not enough. labels: - "ubuntu-22.04:docker://node:16-bullseye" + - "node-22-bullseye:docker://node:22-bullseye" + - "node-22-bookworm:docker://node:22-bookworm" cache: # Enable cache server to use actions/cache. diff --git a/docker/envs/gitea/.env b/docker/envs/gitea/.env index 1a204e8..9963d29 100644 --- a/docker/envs/gitea/.env +++ b/docker/envs/gitea/.env @@ -1,14 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -35623364633833623964623536646534373634663736613561333561343136333965306638396532 -6162393239383936386338666565306132646230383066630a336337613636383431623738343663 -61343262363631376665383035323139313863626331666439336134613035663439376231343863 -3032353139643138640a383365356630323835383538393734643134343133653033383663333464 -62386361633435633664306531623835353665326432393932336163316561653866343137323030 -63643262323436356166373533363235366238393633336631336266373837373932313134303563 -65633337393938623134636538653561356565333831356638373862376333336163363438626438 -39343436383732313561396236656530303064363961663636353538346264633532633866333162 -35303032303662646166333537373566316462633536333463323433353539623363323036643763 -34376365613932303133366236613235636238643139666663356436326532616437383432303437 -39376535656266383465373837643634383937656431323265386163373138336164383666383962 -64623762613332363731323739666238613634646237396331666463363663313461313966356233 -30653362353061333739303234336461373337346632646433623462623765353330 +30626565616334613665623138613533653739333038643530636633393264393334373563326631 +3838333663306537326534333666316539383038363236650a613163643433653466666639666366 +33653861613638653862393338386334643332633762666136613932343834333162303363373030 +6161323863316134340a646532386537313164643039353435633535363061616363363337663365 +39343461356631383062353837383034653430373663323966373632323063636132613137643662 +37373065313764626539396463376637353136613365366566363436356537343932376565633962 +62316631663634316530623736613961623635303763633964386433333531626437303136363537 +35393134643935316330396161303134626537643162393062636363376435636162393136373034 +39636231626635643530313634333464653564353861656666633035623932336234303735386366 +62303133326237613763336435323338623036663137333439613462333434303734303737363936 +65333762376233396332633434353832373136383137336665623534356538636166303835376334 +64346139656432633230386666653531333864333664393936366630346334323963343431346164 +64376165666230386464303036303861653437646463633764343064376464396135