Merge branch 'main' into fedora-41-builds

rsturla · Sep 26, 2024 · 83f3da5 · 83f3da5
2 parents 26159cc + 013738f
commit 83f3da5
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 13 deletions.
diff --git a/.github/actions/build-image/action.yml b/.github/actions/build-image/action.yml
@@ -88,8 +88,12 @@ runs:
       run: |
         echo "image=${{ inputs.image-name }}" >> $GITHUB_OUTPUT
         if [ "$BUILDER" == "podman" ]; then
+          # Reading space-separated list into an array
+          IFS=' ' read -r -a tag_array <<< "${{ inputs.image-tags }}"
+          single_tag="${tag_array[0]}"
+
           echo "tags=${{ inputs.image-tags }}" >> $GITHUB_OUTPUT
-          digest=$(podman image inspect ${{ inputs.image-name }} --format '{{.Digest}}')
+          digest=$(podman image inspect ${{ inputs.image-name }}:$single_tag --format '{{.Digest}}')
           echo "digest=$digest" >> $GITHUB_OUTPUT
         else
           echo "tags=${{ inputs.image-tags }}" >> $GITHUB_OUTPUT

diff --git a/.github/actions/generate-image-tags/action.yml b/.github/actions/generate-image-tags/action.yml
@@ -36,6 +36,12 @@ outputs:
   primary-name-full:
     description: 'Full name of the OCI image with primary tag'
     value: ${{ steps.set-outputs.outputs.PRIMARY_NAME_FULL }}
+  stable-tag:
+    description: 'Stable tag for the OCI image'
+    value: ${{ steps.set-outputs.outputs.STABLE_TAG }}
+  stable-name-full:
+    description: 'Full name of the OCI image with stable tag'
+    value: ${{ steps.set-outputs.outputs.STABLE_NAME_FULL }}
 
 runs:
   using: composite
@@ -53,9 +59,10 @@ runs:
       run: |
         echo "Generating tags for pull request..."
 
+        STABLE_TAG_PRE_SUFFIX="pr$PR_NUMBER-$MAJOR_VERSION"
+        PRIMARY_TAG_PRE_SUFFIX="pr$PR_NUMBER-$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         TAGS_PRE_SUFFIX=(
           "pr$PR_NUMBER-$MAJOR_VERSION"
-          "pr$PR_NUMBER-$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         )
         TAG_SUFFIXES=()
 
@@ -78,16 +85,27 @@ runs:
           fi
         done
 
-        PRIMARY_TAG="pr$PR_NUMBER-$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         if [[ "$IS_NVIDIA_DRIVER" == true ]]; then
-          PRIMARY_TAG="$PRIMARY_TAG-nvidia"
+          STABLE_TAG="$STABLE_TAG_PRE_SUFFIX-nvidia"
+        else
+          STABLE_TAG="$STABLE_TAG_PRE_SUFFIX"
         fi
+        echo "Generated stable tag: $STABLE_TAG"
+        TAGS+=("$STABLE_TAG")
 
+        if [[ "$IS_NVIDIA_DRIVER" == true ]]; then
+          PRIMARY_TAG="$PRIMARY_TAG_PRE_SUFFIX-nvidia"
+        else
+          PRIMARY_TAG="$PRIMARY_TAG_PRE_SUFFIX"
+        fi
         echo "Generated primary tag: $PRIMARY_TAG"
+        TAGS+=("$PRIMARY_TAG")
+
         echo "Generated tags: ${TAGS[*]}"
         echo "TAGS=${TAGS[*]}" >> "$GITHUB_OUTPUT"
         echo "TAGS_CONCAT=$(IFS=, ; echo "${TAGS[*]}")" >> "$GITHUB_OUTPUT"
         echo "PRIMARY_TAG=$PRIMARY_TAG" >> "$GITHUB_OUTPUT"
+        echo "STABLE_TAG=$STABLE_TAG" >> "$GITHUB_OUTPUT"
 
         NAMES_FULL=()
         for TAG in "${TAGS[@]}"; do
@@ -98,6 +116,7 @@ runs:
         echo "NAMES_FULL=${NAMES_FULL[*]}" >> "$GITHUB_OUTPUT"
         echo "NAMES_FULL_CONCAT=$(IFS=, ; echo "${NAMES_FULL[*]}")" >> "$GITHUB_OUTPUT"
         echo "PRIMARY_NAME_FULL=$IMAGE_NAME:$PRIMARY_TAG" >> "$GITHUB_OUTPUT"
+        echo "STABLE_NAME_FULL=$IMAGE_NAME:$STABLE_TAG" >> "$GITHUB_OUTPUT"
 
     - name: Generate Tags
       if: inputs.is-release == 'true'
@@ -111,9 +130,10 @@ runs:
       run: |
         echo "Generating tags for release..."
 
+        STABLE_TAG_PRE_SUFFIX="$MAJOR_VERSION"
+        PRIMARY_TAG_PRE_SUFFIX="$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         TAGS_PRE_SUFFIX=(
           "$MAJOR_VERSION"
-          "$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         )
         TAG_SUFFIXES=()
 
@@ -136,16 +156,27 @@ runs:
           fi
         done
 
-        PRIMARY_TAG="$(git rev-parse --short HEAD)-$MAJOR_VERSION"
         if [[ "$IS_NVIDIA_DRIVER" == true ]]; then
-          PRIMARY_TAG="$PRIMARY_TAG-nvidia"
+          STABLE_TAG="$STABLE_TAG_PRE_SUFFIX-nvidia"
+        else
+          STABLE_TAG="$STABLE_TAG_PRE_SUFFIX"
         fi
+        echo "Generated stable tag: $STABLE_TAG"
+        TAGS+=("$STABLE_TAG")
 
+        if [[ "$IS_NVIDIA_DRIVER" == true ]]; then
+          PRIMARY_TAG="$PRIMARY_TAG_PRE_SUFFIX-nvidia"
+        else
+          PRIMARY_TAG="$PRIMARY_TAG_PRE_SUFFIX"
+        fi
         echo "Generated primary tag: $PRIMARY_TAG"
+        TAGS+=("$PRIMARY_TAG")
+
         echo "Generated tags: ${TAGS[*]}"
         echo "TAGS=${TAGS[*]}" >> "$GITHUB_OUTPUT"
         echo "TAGS_CONCAT=$(IFS=, ; echo "${TAGS[*]}")" >> "$GITHUB_OUTPUT"
         echo "PRIMARY_TAG=$PRIMARY_TAG" >> "$GITHUB_OUTPUT"
+        echo "STABLE_TAG=$STABLE_TAG" >> "$GITHUB_OUTPUT"
 
         NAMES_FULL=()
         for TAG in "${TAGS[@]}"; do
@@ -156,6 +187,7 @@ runs:
         echo "NAMES_FULL=${NAMES_FULL[*]}" >> "$GITHUB_OUTPUT"
         echo "NAMES_FULL_CONCAT=$(IFS=, ; echo "${NAMES_FULL[*]}")" >> "$GITHUB_OUTPUT"
         echo "PRIMARY_NAME_FULL=$IMAGE_NAME:$PRIMARY_TAG" >> "$GITHUB_OUTPUT"
+        echo "STABLE_NAME_FULL=$IMAGE_NAME:$STABLE_TAG" >> "$GITHUB_OUTPUT"
 
     - name: Set Outputs
       id: set-outputs
@@ -171,11 +203,15 @@ runs:
           echo "NAMES_FULL_CONCAT=${{ steps.generate-tags.outputs.NAMES_FULL_CONCAT }}" >> $GITHUB_OUTPUT
           echo "PRIMARY_TAG=${{ steps.generate-tags.outputs.PRIMARY_TAG }}" >> $GITHUB_OUTPUT
           echo "PRIMARY_NAME_FULL=${{ steps.generate-tags.outputs.PRIMARY_NAME_FULL }}" >> $GITHUB_OUTPUT
+          echo "STABLE_TAG=${{ steps.generate-tags.outputs.STABLE_TAG }}" >> $GITHUB_OUTPUT
+          echo "STABLE_NAME_FULL=${{ steps.generate-tags.outputs.STABLE_NAME_FULL }}" >> $GITHUB_OUTPUT
         else
           echo "TAGS=${{ steps.generate-tags-pull-request.outputs.TAGS }}" >> $GITHUB_OUTPUT
           echo "TAGS_CONCAT=${{ steps.generate-tags-pull-request.outputs.TAGS_CONCAT }}" >> $GITHUB_OUTPUT
           echo "NAMES_FULL=${{ steps.generate-tags-pull-request.outputs.NAMES_FULL }}" >> $GITHUB_OUTPUT
           echo "NAMES_FULL_CONCAT=${{ steps.generate-tags-pull-request.outputs.NAMES_FULL_CONCAT }}" >> $GITHUB_OUTPUT
           echo "PRIMARY_TAG=${{ steps.generate-tags-pull-request.outputs.PRIMARY_TAG }}" >> $GITHUB_OUTPUT
           echo "PRIMARY_NAME_FULL=${{ steps.generate-tags-pull-request.outputs.PRIMARY_NAME_FULL }}" >> $GITHUB_OUTPUT
+          echo "STABLE_TAG=${{ steps.generate-tags-pull-request.outputs.STABLE_TAG }}" >> $GITHUB_OUTPUT
+          echo "STABLE_NAME_FULL=${{ steps.generate-tags-pull-request.outputs.STABLE_NAME_FULL }}" >> $GITHUB_OUTPUT
         fi
diff --git a/.github/actions/rechunk/action.yml b/.github/actions/rechunk/action.yml
@@ -0,0 +1,83 @@
+name: Rechunk Image
+
+inputs:
+  builder:
+    description: 'The name of the builder to use (docker or podman)'
+    required: false
+    default: 'podman'
+  ref:
+    description: 'The reference to the image to rechunk'
+    required: true
+  prev-ref:
+    description: 'The reference to the previous image'
+    required: false
+  tags:
+    description: 'The tags to apply to the rechunked image'
+    required: false
+    default: ''
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Prepare Rechunk (Podman)
+      if: ${{ inputs.builder == 'podman' }}
+      shell: bash
+      env:
+        SOURCE_IMAGE: ${{ inputs.ref }}
+      run: |
+        set -euox pipefail
+        sudo apt update && sudo apt install systemd-container
+        podman image ls
+        sudo podman image scp $(whoami)@localhost::${SOURCE_IMAGE} root@localhost::
+        sudo podman image ls
+        podman rmi $(podman image ls -qa) --force
+
+    - name: Prepare Rechunk (Docker)
+      if: ${{ inputs.builder == 'docker' }}
+      shell: bash
+      env:
+        SOURCE_IMAGE: ${{ inputs.ref }}
+      run: |
+        set -euox pipefail
+        docker save $(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep ${SOURCE_IMAGE}) | sudo podman load
+        sudo podman image ls
+        docker rmi $(docker image ls -qa) --force
+
+    - name: Rechunk Image
+      id: rechunk
+      uses: hhd-dev/[email protected]
+      with:
+        rechunk: ghcr.io/hhd-dev/rechunk:v0.8.6
+        ref: ${{ inputs.ref }}
+        skip_compression: true
+        prev-ref: ${{ inputs.prev-ref }}
+
+    - name: Load Rechunked Image (Podman)
+      if: ${{ inputs.builder == 'podman' }}
+      shell: bash
+      run: |
+        sudo podman rmi $(sudo podman image ls -qa) --force
+        IMAGE=$(podman pull ${{ steps.rechunk.outputs.ref }})
+        tags="${{ inputs.tags }}"
+        sudo rm -rf ${{ steps.rechunk.outputs.location }}
+        IFS=' ' read -r -a tag_array <<< "$tags"
+        for tag in "${tag_array[@]}"; do
+          podman tag $IMAGE ${{ env.IMAGE_NAME }}:${tag}
+        done
+        podman image ls
+
+    - name: Load Rechunked Image (Docker)
+      if: ${{ inputs.builder == 'docker' }}
+      shell: bash
+      run: |
+        set -euox pipefail
+        sudo podman rmi $(sudo podman image ls -qa) --force
+        IMAGE="temporary-image:latest"
+        sudo skopeo copy ${{ steps.rechunk.outputs.ref }} docker-daemon:${IMAGE}
+        tags="${{ inputs.tags }}"
+        sudo rm -rf ${{ steps.rechunk.outputs.location }}
+        IFS=' ' read -r -a tag_array <<< "$tags"
+        for tag in "${tag_array[@]}"; do
+          docker tag $IMAGE ${{ env.IMAGE_NAME }}:${tag}
+        done
+        docker image ls
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   build-base:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -43,8 +43,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
-      - name: Optimize GHA Storage
-        uses: ./.github/actions/optimise-gha-storage
+      - name: Maximize build space
+        uses: ublue-os/remove-unwanted-software@v7
+        with:
+          remove-codeql: true
 
       - name: Generate Image Tags
         uses: ./.github/actions/generate-image-tags
@@ -83,6 +85,16 @@ jobs:
             FEDORA_EDITION=${{ matrix.fedora-edition }}
             COREOS_KERNEL=${{ env.COREOS_KERNEL }}
 
+      - name: Rechunk
+        id: rechunk
+        if: false
+        uses: ./.github/actions/rechunk
+        with:
+          builder: ${{ steps.build.outputs.builder }}
+          ref: ${{ steps.build.outputs.image }}:${{ steps.generate-image-tags.outputs.primary-tag }}
+          prev-ref: ${{ env.IMAGE_REGISTRY }}/${{ steps.build.outputs.image }}:${{ steps.generate-image-tags.outputs.primary-tag }}
+          tags: ${{ steps.build.outputs.tags }}
+
       - name: Push Image
         id: push
         uses: ./.github/actions/push-image
@@ -107,7 +119,7 @@ jobs:
           private-key-passphrase: ${{ secrets.ETERNAL_LINUX_SIGNING_KEY_PASSPHRASE }}
 
   build-nvidia:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build-base
     if: ${{ !cancelled() }}
     strategy:
@@ -128,8 +140,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
-      - name: Optimize GHA Storage
-        uses: ./.github/actions/optimise-gha-storage
+      - name: Maximize build space
+        uses: ublue-os/remove-unwanted-software@v7
+        with:
+          remove-codeql: true
 
       - name: Generate Image Tags
         uses: ./.github/actions/generate-image-tags
@@ -186,6 +200,16 @@ jobs:
             ${{ matrix.nvidia-type == 'open' && format('NVIDIA_AKMODS_IMAGE={0}', 'ghcr.io/rsturla/akmods/nvidia-open') || '' }}
             NVIDIA_AKMODS_TAG=${{ matrix.fedora-version }}
 
+      - name: Rechunk
+        id: rechunk
+        if: false
+        uses: ./.github/actions/rechunk
+        with:
+          builder: ${{ steps.build.outputs.builder }}
+          ref: ${{ steps.build.outputs.image }}:${{ steps.generate-image-tags.outputs.primary-tag }}
+          prev-ref: ${{ env.IMAGE_REGISTRY }}/${{ steps.build.outputs.image }}:${{ steps.generate-image-tags.outputs.primary-tag }}
+          tags: ${{ steps.build.outputs.tags }}
+
       - name: Push Image
         id: push
         uses: ./.github/actions/push-image