fix: Add log to gulp and rebase before build images (kyma-project#4194)

* add log to gulp and rebase before build

* fix gulp

* fix gulp

Author: dbadura

.github/workflows/busola-backend-build.yml

@@ -26,6 +26,12 @@ permissions:
   contents: read # This is required for actions/checkout
 
 jobs:
+  rebase:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge with latest main
+        uses: ./.github/actions/merge
   build-backend-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
     if: github.event.pull_request.draft == false

.github/workflows/busola-build.yml

@@ -21,7 +21,7 @@ on:
       - "Dockerfile"
       - "nginx/nginx.conf"
   pull_request_target:
-    types: [opened, edited, synchronize, reopened, ready_for_review]
+    types: [ opened, edited, synchronize, reopened, ready_for_review ]
     paths:
       - ".github/workflows/busola-build.yml"
       - "kyma/**"
@@ -41,6 +41,12 @@ permissions:
   contents: read # This is required for actions/checkout
 
 jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      - name: Merge with latest main
+        uses: ./.github/actions/merge
   build-busola-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
     if: github.event.pull_request.draft == false

.github/workflows/busola-web-build.yml

@@ -36,6 +36,12 @@ permissions:
   contents: read # This is required for actions/checkout
 
 jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      - name: Merge with latest main
+        uses: ./.github/actions/merge
   build-web-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
     if: github.event.pull_request.draft == false

kyma/gulpfile.js

@@ -1,9 +1,9 @@
 import fetch from 'node-fetch';
 import { URL } from 'url';
-import { readFile, lstatSync, readdirSync } from 'fs';
-import { load, dump } from 'js-yaml';
+import { lstatSync, readdirSync, readFile } from 'fs';
+import { dump, load } from 'js-yaml';
 
-import { task, src, dest } from 'gulp';
+import { dest, src, task } from 'gulp';
 import { obj as _obj } from 'through2';
 import concat from 'gulp-concat';
 import clean from 'gulp-clean';
@@ -71,6 +71,7 @@ const loadExtensions = _obj(async function(extensionsFile, _, cb) {
 });
 
 const loadPreparedExtensions = _obj((file, _, cb) => {
+  console.log('Loading:', file.history);
   const convertYamlToObject = yamlString => {
     return load(yamlString, { json: true });
   };
@@ -99,9 +100,9 @@ const loadPreparedExtensions = _obj((file, _, cb) => {
 task('clean-extensions', () => {
   const env = process.env.ENV;
   return src(`environments/temp/${env}/extensions-local`, {
-      read: false,
-      allowEmpty: true,
-    })
+    read: false,
+    allowEmpty: true,
+  })
     .pipe(clean({ force: true }));
 });
 
@@ -126,9 +127,9 @@ task('pack-extensions', () => {
 task('clean-statics', () => {
   const env = process.env.ENV;
   return src(`environments/temp/${env}/extensions/statics-local`, {
-      read: false,
-      allowEmpty: true,
-    })
+    read: false,
+    allowEmpty: true,
+  })
     .pipe(clean());
 });
 
@@ -153,9 +154,9 @@ task('pack-statics', () => {
 task('clean-wizards', () => {
   const env = process.env.ENV;
   return src(`environments/temp/${env}/extensions/wizards-local`, {
-      read: false,
-      allowEmpty: true,
-    })
+    read: false,
+    allowEmpty: true,
+  })
     .pipe(clean());
 });