From b36db3b0bf78ab13b86e145dea98a7c156485b70 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:28:15 -0500 Subject: [PATCH] Revert ansible-core version due to CentOS 9; Need a solution for this... --- .gitea/workflows/build-test.yml | 6 ++++++ build/{Containerfile.fedora39 => Containerfile.fedora41} | 2 +- python/requirements.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) rename build/{Containerfile.fedora39 => Containerfile.fedora41} (93%) diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 60a2c6a..a992a29 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -19,6 +19,7 @@ jobs: Check-Environment: runs-on: self-hosted + needs: [Cleanup-Old-Artifacts] defaults: run: working-directory: /home/builds/src @@ -36,6 +37,7 @@ jobs: Clone-Repo: runs-on: self-hosted + needs: [Check-Environment] defaults: run: working-directory: /home/builds/src @@ -53,6 +55,7 @@ jobs: Build-Images: runs-on: self-hosted + needs: [Check-Environment, Clone-Repo] defaults: run: working-directory: /home/builds/src/ansible-dev @@ -76,6 +79,7 @@ jobs: Push-Images: runs-on: self-hosted + needs: [Build-Images] steps: - name: Docker login run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }} @@ -90,6 +94,7 @@ jobs: Cleanup-Build-Images: runs-on: self-hosted + needs: [Build-Images, Push-Images] steps: - name: Cleanup build images run: | @@ -101,6 +106,7 @@ jobs: Cleanup-Docker-Login: runs-on: self-hosted + needs: [Push-Images] steps: - name: Cleanup Docker login run: rm -v /home/builds/.docker/config.json diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora41 similarity index 93% rename from build/Containerfile.fedora39 rename to build/Containerfile.fedora41 index ca27c86..a09f756 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora41 @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 LABEL maintainer="Chris Hammer (chris@thezengarden.net)" RUN rm /etc/localtime \ diff --git a/python/requirements.txt b/python/requirements.txt index a7b5133..1cb2001 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,2 +1,2 @@ -ansible-core==2.16.14 +ansible-core==2.15.13 ansible-lint==24.12.2