Merge pull request #4133 from RedisInsight/be/feature/RI-6349_Fix_mas_build

#RI-6325, #RI-6349, #RI-6355

Author: vlad-dargel

.github/workflows/pipeline-build-docker.yml

@@ -7,8 +7,8 @@ on:
         default: 'staging'
         type: string
 
-      only_docker:
-        description: Build only docker
+      for_e2e_tests:
+        description: Build for e2e docker tests
         default: false
         type: boolean
 
@@ -45,7 +45,16 @@ jobs:
       run: ./.github/build/build.sh
 
       # todo: matrix
+    - name: Build web archives for e2e tests
+      if: inputs.for_e2e_tests
+      run: |
+        unset npm_config_keytar_binary_host_mirror
+        unset npm_config_node_sqlite3_binary_host_mirror
+        # Docker sources
+        PLATFORM=linux ARCH=x64 LIBC=musl .github/build/build_modules.sh
+
     - name: Build web archives
+      if: ${{ !inputs.for_e2e_tests }}
       run: |
         unset npm_config_keytar_binary_host_mirror
         unset npm_config_node_sqlite3_binary_host_mirror
@@ -60,10 +69,8 @@ jobs:
         PLATFORM=darwin ARCH=arm64 .github/build/build_modules.sh
         # VSC Windows
         PLATFORM=win32 ARCH=x64 .github/build/build_modules.sh
-    - name: Build Docker (x64, arm64)
-      env:
-        ENV: ${{ vars.ENV }}
-        RI_SEGMENT_WRITE_KEY: ${{ secrets.RI_SEGMENT_WRITE_KEY }}
+
+    - name: Build Docker (x64)
       run: |
         # Build alpine x64 image
         docker buildx build \
@@ -75,6 +82,12 @@ jobs:
         -t redisinsight:amd64 \
         .
 
+        mkdir -p release/docker
+        docker image save -o release/docker/docker-linux-alpine.amd64.tar redisinsight:amd64
+
+    - name: Build Docker (arm64)
+      if: ${{ !inputs.for_e2e_tests }}
+      run: |
         # Build alpine arm64 image
         docker buildx build \
         -f .github/build/build.Dockerfile \
@@ -86,7 +99,6 @@ jobs:
         .
 
         mkdir -p release/docker
-        docker image save -o release/docker/docker-linux-alpine.amd64.tar redisinsight:amd64
         docker image save -o release/docker/docker-linux-alpine.arm64.tar redisinsight:arm64
 
     - uses: actions/upload-artifact@v4
@@ -100,6 +112,7 @@ jobs:
           ./release/web-mini
 
     env:
+      ENV: ${{ vars.ENV }}
       RI_AI_CONVAI_TOKEN: ${{ secrets.RI_AI_CONVAI_TOKEN }}
       RI_AI_QUERY_PASS: ${{ secrets.RI_AI_QUERY_PASS }}
       RI_AI_QUERY_USER: ${{ secrets.RI_AI_QUERY_USER }}

.github/workflows/pipeline-build-macos.yml

@@ -71,12 +71,10 @@ jobs:
         echo $APP_BUNDLE_VERSION
         echo $CSC_KEYCHAIN
 
-        yarn package:stage
+        yarn package:stage && yarn package:mas
         rm -rf release/mac
-        
-        # TODO: return MAS build
-        # yarn package:stage && yarn package:mas
-        # mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
+
+        mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
 
     # handle manual builds
     - name: Build macos dmg (custom)

.github/workflows/tests-e2e-docker.yml

@@ -33,14 +33,6 @@ jobs:
   e2e-docker-tests:
     runs-on: ubuntu-latest
     name: E2E Docker tests
-    # environment:
-      # name: production
-    container:
-      image: docker:latest
-      options: --privileged
-      volumes:
-        - /usr/src/app/results:/usr/src/app/results
-        - /usr/src/app/report:/usr/src/app/report
     strategy:
       fail-fast: false
       matrix:
@@ -50,9 +42,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Setup repository
-      run: git config --global --add safe.directory /__w/RedisInsight/RedisInsight
-
     # SSH Debug
     - name: Enable SSH
       uses: mxschmitt/action-tmate@v3
@@ -74,6 +63,7 @@ jobs:
       working-directory: ./tests/e2e
       run: |
         testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 4 == ${{ matrix.parallel }}")
+
         echo $testFiles
 
         # Multi-Line value
@@ -117,23 +107,8 @@ jobs:
         list-suites: 'failed'
         fail-on-error: 'false'
 
-    - name: Add link to report in the workflow summary
-      if: always()
-      run: |
-        DATE=$(date +'%Y-%m-%d')
-        link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${DATE}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}/index.html"
-
-        echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY
-
-  # Deploy report to AWS test bucket
-  deploy-report:
-    name: Deploy report
-    needs: 'e2e-docker-tests'
-    if: always()
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
     - name: Deploy report
+      if: always()
       uses: ./.github/actions/deploy-test-reports
       with:
         group: 'report'
@@ -143,3 +118,12 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
+    - name: Add link to report in the workflow summary
+      if: always()
+      run: |
+        DATE=$(date +'%Y-%m-%d')
+        link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${DATE}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}/index.html"
+
+        echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY
+
+

.github/workflows/tests.yml

@@ -106,12 +106,12 @@ jobs:
       redis_client: ${{ inputs.redis_client || '' }}
       debug: ${{ inputs.debug || false }}
 
-  # E2E Approve
+  # # E2E Approve
   e2e-approve:
     runs-on: ubuntu-latest
     needs: changes
-    timeout-minutes: 60
     if: inputs.group_tests == 'all' || inputs.group_tests == 'only_e2e' || startsWith(github.ref_name, 'e2e/')
+    timeout-minutes: 60
     environment: ${{ startsWith(github.ref_name, 'e2e/') && 'e2e-approve' || 'staging' }}
     name: Approve E2E tests
     steps:
@@ -124,7 +124,7 @@ jobs:
     secrets: inherit
     with:
       debug: ${{ inputs.debug || false }}
-      only_docker: true
+      for_e2e_tests: true
 
   e2e-docker-tests:
     needs: build-docker
@@ -139,7 +139,7 @@ jobs:
     needs: e2e-approve
     secrets: inherit
     with:
-      target: linux:appimage:x64
+      target: build_linux_appimage_x64
       debug: ${{ inputs.debug || false }}
 
   e2e-appimage-tests:
@@ -151,16 +151,14 @@ jobs:
 
   clean:
     uses: ./.github/workflows/clean-deployments.yml
+    if: always()
     needs: [frontend-tests, backend-tests, integration-tests, e2e-docker-tests, e2e-appimage-tests]
-    if: ${{ !inputs.pre_release && always() }}
 
   # Remove artifacts from github actions
   remove-artifacts:
     name: Remove artifacts
-    needs: [clean]
-    if: ${{ !inputs.pre_release && always() }}
+    needs: [frontend-tests, backend-tests, integration-tests, e2e-docker-tests, e2e-appimage-tests]
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
     - name: Remove all artifacts

electron-builder.json

@@ -7,13 +7,11 @@
     "node_modules",
     "package.json"
   ],
-  "npmRebuild": false,
   "artifactName": "Redis-Insight-${os}-${arch}.${ext}",
   "compression": "normal",
   "asarUnpack": [
     "node_modules/keytar",
-    "node_modules/sqlite3",
-    "node_modules/cpu-features"
+    "node_modules/sqlite3"
   ],
   "protocols": [{
     "name": "RedisInsight",

package.json

@@ -78,7 +78,6 @@
     "**/trim": "0.0.3",
     "word-wrap": "1.2.4",
     "**/semver": "^7.5.2",
-    "@electron/notarize": "2.5.0",
     "rawproto/protobufjs": "^7.2.5",
     "webpack-bundle-analyzer/ws": "^7.5.10",
     "msw/path-to-regexp": "^6.3.0",

redisinsight/api/package.json

@@ -48,6 +48,7 @@
     "@nestjs/platform-socket.io/socket.io": "^4.8.0",
     "@nestjs/cli/**/braces": "^3.0.3",
     "**/semver": "^7.5.2",
+    "**/cpu-features": "file:./stubs/cpu-features",
     "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
   },
   "dependencies": {

redisinsight/api/stubs/cpu-features/index.js

@@ -0,0 +1 @@
+module.exports = {};

redisinsight/api/stubs/cpu-features/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "cpu-features",
+  "version": "1.0.0",
+  "main": "index.js"
+}

redisinsight/api/test/test-runs/test.Dockerfile

@@ -6,6 +6,7 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
 WORKDIR /usr/src/app
 
 COPY package.json yarn.lock ./
+COPY stubs ./stubs
 RUN yarn install
 COPY . .