chore: run build tests on both arm64 and x86

Author: sweatybridge

.github/workflows/package.yml renamed to .github/workflows/package-plv8.yml

@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   settings:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       image_tag: ${{ steps.meta.outputs.image_tag }}
     steps:
@@ -28,40 +28,17 @@ jobs:
           postgresql_major=$(grep -o 'postgresql_major=.*' ansible/Dockerfile | head -1 | cut -d "=" -f 2)
           echo "image_tag=${plv8_release}-pg${postgresql_major}" >> $GITHUB_OUTPUT
 
-  build_x86:
-    needs: settings
-    runs-on: [self-hosted, X64]
-    timeout-minutes: 180
-    env:
-      arch: amd64
-    outputs:
-      image_digest: ${{ steps.build.outputs.digest }}
-    steps:
-      - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: builders
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - id: build
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          context: "{{defaultContext}}:ansible"
-          target: plv8-deb
-          tags: ${{ env.image }}:${{ needs.settings.outputs.image_tag }}_${{ env.arch }}
-          platforms: linux/${{ env.arch }}
-          no-cache: true
-
-  build_arm:
+  build_image:
     needs: settings
-    runs-on: [arm-runner]
+    strategy:
+      matrix:
+        include:
+          - runner: [self-hosted, X64]
+            arch: amd64
+          - runner: arm-runner
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 180
-    env:
-      arch: arm64
     outputs:
       image_digest: ${{ steps.build.outputs.digest }}
     steps:
@@ -80,12 +57,12 @@ jobs:
           push: true
           context: "{{defaultContext}}:ansible"
           target: plv8-deb
-          tags: ${{ env.image }}:${{ needs.settings.outputs.image_tag }}_${{ env.arch }}
-          platforms: linux/${{ env.arch }}
+          tags: ${{ env.image }}:${{ needs.settings.outputs.image_tag }}_${{ matrix.arch }}
+          platforms: linux/${{ matrix.arch }}
           no-cache: true
 
   merge_manifest:
-    needs: [settings, build_x86, build_arm]
+    needs: [settings, build_image]
     runs-on: ubuntu-latest
     steps:
       - uses: docker/setup-buildx-action@v2
@@ -97,5 +74,5 @@ jobs:
       - name: Merge multi-arch manifests
         run: |
           docker buildx imagetools create -t ${{ env.image }}:${{ needs.settings.outputs.image_tag }} \
-          ${{ env.image }}@${{ needs.build_x86.outputs.image_digest }} \
-          ${{ env.image }}@${{ needs.build_arm.outputs.image_digest }}
+          ${{ env.image }}:${{ needs.settings.outputs.image_tag }}_amd64 \
+          ${{ env.image }}:${{ needs.settings.outputs.image_tag }}_arm64

.github/workflows/test.yml

@@ -9,7 +9,14 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - runner: [self-hosted, X64]
+            arch: amd64
+          - runner: arm-runner
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 180
     env:
       POSTGRES_PORT: 5478
@@ -20,7 +27,11 @@ jobs:
         uses: mikefarah/yq@master
         with:
           cmd: yq 'to_entries | map(select(.value|type == "!!str")) |  map(.key + "=" + .value) | join(" ")' 'ansible/vars.yml'
+
+      - run: docker context create builders
       - uses: docker/setup-buildx-action@v2
+        with:
+          endpoint: builders
       - uses: docker/build-push-action@v3
         with:
           push: false
@@ -41,8 +52,14 @@ jobs:
 
       - name: Install dbmate
         run: |
-          curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/latest/download/dbmate-linux-amd64
-          sudo chmod +x /usr/local/bin/dbmate
+          curl -fsSL -o dbmate https://github.com/amacneil/dbmate/releases/latest/download/dbmate-linux-${{ matrix.arch }}
+          sudo chmod +x dbmate
+          sudo mv dbmate /usr/local/bin/
+
+      - name: Install psql
+        run: |
+          sudo apt update
+          sudo apt install -y --no-install-recommends postgresql-client
 
       - name: Install pg_prove
         run: sudo cpan -T TAP::Parser::SourceHandler::pgTAP

ansible/Dockerfile

@@ -364,6 +364,7 @@ RUN tar -xvf /tmp/plv8.tar.gz -C /tmp && \
     rm -rf /tmp/plv8.tar.gz
 # Install build dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
     pkg-config \
     ninja-build \
     git \
@@ -592,6 +593,9 @@ RUN --mount=type=cache,source=/ccache,target=/ccache,from=public.ecr.aws/t3w2s2c
 # Create debian package
 RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
 
+FROM scratch as pgroonga-deb
+COPY --from=pgroonga-source /tmp/*.deb /tmp/
+
 FROM base as pgroonga
 # Download pre-built packages
 ADD "https://packages.groonga.org/debian/groonga-apt-source-latest-bullseye.deb" /tmp/source.deb
@@ -678,7 +682,7 @@ RUN --mount=type=cache,source=/ccache,target=/ccache,from=public.ecr.aws/t3w2s2c
 RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
 
 ####################
-# Build extension packages
+# Collect extension packages
 ####################
 FROM scratch as extensions
 COPY --from=postgis /tmp/*.deb /tmp/
@@ -749,7 +753,8 @@ HEALTHCHECK --interval=2s --timeout=2s --retries=10 CMD pg_isready -U postgres -
 # Update build cache
 ####################
 FROM production as stats
-COPY --from=plv8-source /tmp/*.deb /tmp/
+COPY --from=plv8-deb /tmp/*.deb /tmp/
+COPY --from=pgroonga-deb /tmp/*.deb /tmp/
 RUN --mount=type=cache,source=/ccache,target=/ccache,from=public.ecr.aws/t3w2s2c9/postgres-buildcache:docker \
     ccache -s && \
     cp -r /ccache /tmp