fix: github actions cross compile

Author: Xetera

.github/workflows/build.yaml

@@ -19,37 +19,17 @@ jobs:
       contents: read
       attestations: write
       packages: write
-    runs-on: ${{ matrix.runs-on }}
-    strategy:
-      matrix:
-        include:
-          - runs-on: ubuntu-24.04
-            platform: linux/amd64
-          - runs-on: ubuntu-24.04-arm
-            platform: linux/arm64
+    runs-on: ubuntu-24.04
     steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: "${{ github.repository_owner }}"
           password: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Setup Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
@@ -62,7 +42,6 @@ jobs:
             ${{ runner.os }}-buildx-
       - name: Set sync_version from deno.json
         run: |
-          platform=${{ matrix.platform }}
           sync_version=$(jq -r '.version' deno.json)
           echo "sync_version=${sync_version}" >> $GITHUB_ENV
       - name: Build and push @query-doctor/sync
@@ -71,13 +50,14 @@ jobs:
         with:
           context: .
           file: Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
           push: ${{ github.event_name == 'push' }}
           outputs: type=docker
-          platforms: ${{ matrix.platform }}
-          tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.sync_version }}
+          # cache-from: type=local,src=/tmp/.buildx-cache
+          # cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
       # This ugly bit is necessary if you don't want your cache to grow forever
       # until it hits GitHub's limit of 5GB.
       # Temp fix
@@ -87,74 +67,9 @@ jobs:
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-      - name: Export digest
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name == 'push' }}
+      - name: Attest
+        uses: actions/attest-build-provenance@v2
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # TODO: Attest is not working for some reason
-      # - name: Attest
-      #   uses: actions/attest-build-provenance@v2
-      #   with:
-      #     subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      #     subject-digest: ${{ steps.build.outputs.digest }}
-      #     push-to-registry: true
-
-  merge:
-    runs-on: ubuntu-24.04
-    if: ${{ github.event_name == 'push' }}
-    permissions:
-      id-token: write
-      contents: read
-      attestations: write
-      packages: write
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Login to ghcr
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: "${{ github.actor }}"
-          password: "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Create manifest list and push
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          subject-digest: ${{ steps.build.outputs.digest }}
+          push-to-registry: true

src/sync/syncer.ts

@@ -60,7 +60,7 @@ export type SyncResult =
       sampledRecords: Record<string, number>;
       notices: SyncNotice[];
       queries: RecentQueries;
-      // metadata: TableMetadata[];
+      metadata: TableMetadata[];
     }
   | PostgresConnectionError
   | PostgresError
@@ -199,7 +199,7 @@ export class PostgresSyncer {
       notices,
       queries,
       setup: wrapped,
-      metadata: serializedResult.serialized,
+      metadata: serializedResult.schema,
     };
   }
 

test/main_test.ts

@@ -25,14 +25,18 @@ function testDb(): DatabaseConnector<{
     dependencies() {
       return Promise.resolve([
         {
+          sourceSchema: "public",
           sourceTable: "posts",
           sourceColumn: ["poster_id"],
+          referencedSchema: "public",
           referencedTable: "users",
           referencedColumn: ["id"],
         },
         {
+          sourceSchema: "public",
           sourceTable: "users",
           sourceColumn: null,
+          referencedSchema: null,
           referencedTable: null,
           referencedColumn: null,
         },