Merge branch 'f40'

t2linux · Apr 23, 2024 · 128fc52 · 128fc52
2 parents 1d8b174 + b54e495
commit 128fc52
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -21,7 +21,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.IMAGE_NAME }}
-          tags: latest f39 ${{ github.sha }}
+          tags: latest f40 ${{ github.sha }}
           context: ./${{ env.IMAGE_NAME }}
           containerfiles: |
             ${{ env.IMAGE_NAME }}/Containerfile

diff --git a/.github/workflows/fedora-dev.yml b/.github/workflows/fedora-dev.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - f40
 jobs:
   build-image:
     uses: ./.github/workflows/build-image.yml

diff --git a/fedora-dev/Containerfile b/fedora-dev/Containerfile
@@ -1,10 +1,11 @@
-FROM fedora:39
+FROM fedora:40
 SHELL ["/usr/bin/bash", "-c"]
 
 RUN dnf install --quiet -y \
     koji \
     fedpkg \
     git \
+    python-xmltodict \
     rpmdevtools \
     rpm-sign \
     mock \
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ on: @@
       push:
         branches:
           - main
+          - f40
     jobs:
       build-image:
         uses: ./.github/workflows/build-image.yml
@@ Expand Down @@