CI: Update publish job to push multiplatform images

Author: larskanis

.github/workflows/publish-images.yml

@@ -31,52 +31,45 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Use cache from primary pipeline
-        uses: actions/cache@v4
+      - name: Use X64 cache from primary pipeline
+        uses: actions/cache/restore@v4
         with:
-          path: tmp/build-cache
-          key: ${{runner.os}}-${{matrix.platform}}-buildx-${{github.sha}}
-          restore-keys: |
-            ${{runner.os}}-${{matrix.platform}}-buildx
+          path: tmp/build-cache-X64
+          key: ${{ runner.os }}-on-X64-${{ matrix.platform }}-buildx-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-on-X64-${{ matrix.platform }}-buildx
+      - name: Use ARM64 cache from primary pipeline
+        uses: actions/cache/restore@v4
+        with:
+          path: tmp/build-cache-ARM64
+          key: ${{ runner.os }}-on-ARM64-${{ matrix.platform }}-buildx-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-on-ARM64-${{ matrix.platform }}-buildx
+          fail-on-cache-miss: true
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.3"
           bundler-cache: true
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
       - name: Generate docker image names
         id: rcd_config
         run: |
           bundle exec ruby -e ' \
             require "rake_compiler_dock"; \
-            print "image_name="; \
+            print "image_name_opt=-t "; \
             puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})); \
-            print "snapshot_name="; \
+            print "snapshot_name_opt=-t "; \
             puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)); \
             if %q(${{matrix.platform}}).end_with?("-gnu"); \
-              print "generic_linux_snapshot_name="; \
+              print "generic_linux_snapshot_name_opt=-t "; \
               puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)).chomp("-gnu"); \
             end \
           ' | tee -a $GITHUB_OUTPUT
       - name: Build docker image
         env:
-          RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new
+          RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache-X64 --cache-from=type=local,src=tmp/build-cache-ARM64 --cache-to=type=local,dest=tmp/build-cache-new ${{steps.rcd_config.outputs.snapshot_name_opt}} ${{steps.rcd_config.outputs.generic_linux_snapshot_name_opt}}
         run: |
           docker buildx create --driver docker-container --use
-          bundle exec rake build:x86:${{matrix.platform}}
-          # move build cache and remove outdated layers
-          rm -rf tmp/build-cache
-          mv tmp/build-cache-new tmp/build-cache
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{github.actor}}
-          password: ${{secrets.GITHUB_TOKEN}}
-      - name: Push the docker image
-        run: |
-          docker images
-          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.snapshot_name}}
-          docker push ${{steps.rcd_config.outputs.snapshot_name}}
-      - name: Push a generic linux image
-        if: ${{ steps.rcd_config.outputs.generic_linux_snapshot_name }}
-        run: |
-          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.generic_linux_snapshot_name}}
-          docker push ${{steps.rcd_config.outputs.generic_linux_snapshot_name}}
+          bundle exec rake release:${{matrix.platform}}

Rakefile

@@ -174,9 +174,23 @@ task :update_lists do
 end
 
 namespace :release do
-  desc "Push all docker images on #{host_platforms.map(&:first).join(",")}"
-  task :images => "build:all" do
+  host_pl = host_platforms.map(&:first).join(",")
+
+  desc "Push image for JRuby on #{host_pl}"
+  task :jruby => ["build:x86:jruby", "build:arm:jruby"] do
     build_jruby_images(host_platforms, output: 'push')
-    build_mri_images(platforms, host_platforms, output: 'push')
+  end
+
+  desc "Push all docker images on #{host_pl}"
+  multitask :images => :jruby
+
+  platforms.each do |platform, target|
+    desc "Push image for platform #{platform} on #{host_pl}"
+    task platform => ["build:x86:#{platform}", "build:arm:#{platform}"] do
+      build_mri_images([platform], host_platforms, output: 'push')
+    end
+
+    desc "Push all docker images on #{host_pl}"
+    multitask :images => platform
   end
 end