From 98dafcc5af8f3436c81d3151d02507a3726ac9b3 Mon Sep 17 00:00:00 2001
From: Konstantin Burkalev <KSDaemon@gmail.com>
Date: Fri, 24 Jan 2025 23:43:52 +0200
Subject: [PATCH] chore(ci): Unignore native build during docker build for
 master

---
 .github/workflows/master.yml |  5 +++++
 .github/workflows/push.yml   | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 9b0c92d7269d1..697ff86606e7c 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -110,6 +110,11 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+      # current .dockerignore prevents use of native build
+      - name: Unignore native from .dockerignore
+        run: |
+          grep -v -E "packages/cubejs-backend-native/((native)|(index.node))" .dockerignore > .dockerignore.tmp
+          mv .dockerignore.tmp .dockerignore
       - name: Push to Docker Hub
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 25d30e269e617..ecb81eecc03c7 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -106,8 +106,6 @@ jobs:
           command: yarn install --frozen-lockfile
       - name: Lerna tsc
         run: yarn tsc
-      - name: Build native (no python)
-        run: cd packages/cubejs-backend-native && npm run native:build-release
       - name: Build client
         run: yarn build
       - name: Build cubejs-backend-native (with Python)
@@ -446,6 +444,9 @@ jobs:
           command: yarn install --frozen-lockfile
       - name: Lerna tsc
         run: yarn tsc
+      - name: Build cubejs-backend-native (without Python)
+        run: yarn run native:build-release
+        working-directory: ./packages/cubejs-backend-native
       - name: Run Integration tests for ${{ matrix.db }} matrix
         uses: nick-fields/retry@v3
         with:
@@ -682,8 +683,9 @@ jobs:
         run: yarn build
       - name: Lerna tsc
         run: yarn tsc
-      - name: Build native (no python)
-        run: cd packages/cubejs-backend-native && npm run native:build-release
+      - name: Build cubejs-backend-native (without Python)
+        run: yarn run native:build-release
+        working-directory: ./packages/cubejs-backend-native
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       # current .dockerignore prevents use of native build