Merge pull request #4084 from RedisInsight/try_fix_macos_builds

Author: egor-zalenski

.github/e2e/test.app-image.sh

@@ -1,54 +1,25 @@
 #!/bin/bash
 set -e
 
-yarn --cwd tests/e2e install
+ARCH=${ARCH:-x86_64}
+WORKING_DIRECTORY=$(pwd)
+SOURCE_APP=${SOURCE_APP:-"Redis-Insight-linux-$ARCH.AppImage"}
+RI_APP_FOLDER_NAME="Redis-Insight-linux"
+TAR_NAME="Redis-Insight-app-linux.$ARCH.tar.gz"
+TMP_FOLDER="/tmp/Redis-Insight-app-$ARCH"
 
-# Create the ri-test directory if it doesn't exist
-mkdir -p ri-test
+rm -rf "$TMP_FOLDER"
 
-# Extract the AppImage
-chmod +x ./release/*.AppImage
-./release/*.AppImage --appimage-extract
+mkdir -p "$WORKING_DIRECTORY/release/redisstack"
+mkdir -p "$TMP_FOLDER"
 
-# Move contents of squashfs-root to ri-test and remove squashfs-root folder
-mv squashfs-root/* ri-test/
-rm -rf squashfs-root
+cp "./release/$SOURCE_APP" "$TMP_FOLDER"
+cd "$TMP_FOLDER" || exit 1
 
-# Export custom XDG_DATA_DIRS with ri-test
-export XDG_DATA_DIRS="$(pwd)/ri-test:$XDG_DATA_DIRS"
+./"$SOURCE_APP" --appimage-extract
+mv squashfs-root "$RI_APP_FOLDER_NAME"
 
-# create folder before tests run to prevent permissions issue
-mkdir -p tests/e2e/remote
-mkdir -p tests/e2e/rdi
+tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
 
-# Create a custom .desktop file for RedisInsight
-cat > ri-test/redisinsight.desktop <<EOL
-[Desktop Entry]
-Version=1.0
-Name=RedisInsight
-Exec=$(pwd)/ri-test/redisinsight %u
-Icon=$(pwd)/ri-test/resources/app.asar/img/icon.png
-Type=Application
-Terminal=false
-MimeType=x-scheme-handler/redisinsight;
-EOL
-
-# Copy the .desktop file to the local applications directory
-cp ri-test/redisinsight.desktop "$HOME/.local/share/applications"
-
-# Update the desktop database with custom directory
-update-desktop-database "$(pwd)/ri-test/"
-
-# Register the RedisInsight deeplink protocol
-xdg-mime default redisinsight.desktop x-scheme-handler/redisinsight
-
-# Run rte
-docker compose -f tests/e2e/rte.docker-compose.yml build
-docker compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
-./tests/e2e/wait-for-redis.sh localhost 12000 && \
-
-# Run tests
-COMMON_URL=$(pwd)/ri-test/resources/app.asar/dist/renderer/index.html \
-ELECTRON_PATH=$(pwd)/ri-test/redisinsight \
-RI_SOCKETS_CORS=true \
-yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci
+cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
+cd "$WORKING_DIRECTORY" || exit 1

.github/e2e/test.app-image.sso.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+set -e
+
+yarn --cwd tests/e2e install
+
+# Create the ri-test directory if it doesn't exist
+mkdir -p ri-test
+
+# Extract the AppImage
+chmod +x ./release/*.AppImage
+./release/*.AppImage --appimage-extract
+
+# Move contents of squashfs-root to ri-test and remove squashfs-root folder
+mv squashfs-root/* ri-test/
+rm -rf squashfs-root
+
+# Export custom XDG_DATA_DIRS with ri-test
+export XDG_DATA_DIRS="$(pwd)/ri-test:$XDG_DATA_DIRS"
+
+# create folder before tests run to prevent permissions issue
+mkdir -p tests/e2e/remote
+mkdir -p tests/e2e/rdi
+
+# Create a custom .desktop file for RedisInsight
+cat > ri-test/redisinsight.desktop <<EOL
+[Desktop Entry]
+Version=1.0
+Name=RedisInsight
+Exec=$(pwd)/ri-test/redisinsight %u
+Icon=$(pwd)/ri-test/resources/app.asar/img/icon.png
+Type=Application
+Terminal=false
+MimeType=x-scheme-handler/redisinsight;
+EOL
+
+# Copy the .desktop file to the local applications directory
+cp ri-test/redisinsight.desktop "$HOME/.local/share/applications"
+
+# Update the desktop database with custom directory
+update-desktop-database "$(pwd)/ri-test/"
+
+# Register the RedisInsight deeplink protocol
+xdg-mime default redisinsight.desktop x-scheme-handler/redisinsight
+
+# Run rte
+docker compose -f tests/e2e/rte.docker-compose.yml build
+docker compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
+./tests/e2e/wait-for-redis.sh localhost 12000 && \
+
+# Run tests
+COMMON_URL=$(pwd)/ri-test/resources/app.asar/dist/renderer/index.html \
+ELECTRON_PATH=$(pwd)/ri-test/redisinsight \
+RI_SOCKETS_CORS=true \
+yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.github/workflows/manual-build.yml

@@ -49,7 +49,7 @@ on:
       environment:
         description: Environment to run build
         type: environment
-        default: 'staging'
+        default: 'development'
         required: false
 
       debug:

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

@@ -66,16 +66,12 @@ jobs:
       if: (vars.ENV == 'staging' || vars.ENV == 'development') && inputs.target == vars.ALL
       run: yarn package:stage
 
-    - name: Build linux packages (development)
+    - name: Build linux packages (custom)
       if: inputs.target != vars.ALL
       run: |
-        target=""
-        if [ ${{ startsWith(inputs.target, 'linux:') }} == 'true' ]; then
-          inputsTarget=${{inputs.target}}
-          target=${inputsTarget#linux:}
-        fi
+        target=$(echo "${{inputs.target}}" | grep -oE 'build_linux_[^_ ]+' | sed 's/build_linux_//' | sort -u | paste -sd ' ' -)
 
-        if [ ${{ contains(vars.ENV, 'production') }} ]; then
+        if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
           yarn package:prod --linux $target
         else
           yarn package:stage --linux $target

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

@@ -76,18 +76,13 @@ jobs:
         mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
 
     # handle manual builds
-    - name: Build macos dmg (dev)
+    - name: Build macos dmg (custom)
       if: inputs.target != vars.ALL
       run: |
         unset CSC_LINK
-        target=""
+        target=$(echo "${{inputs.target}}" | grep -oE 'build_macos_[^ ]+' | sed 's/build_macos_/dmg:/' | paste -sd ' ' -)
 
-        if [ ${{ startsWith(inputs.target, 'macos:') }} == 'true' ]; then
-          inputsTarget=${{inputs.target}}
-          target=--${inputsTarget#macos:}
-        fi
-
-        if [ ${{ contains(vars.ENV, 'production') }} ]; then
+        if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
           yarn package:prod --mac $target
         else
           yarn package:stage --mac $target

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

@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         # Number of threads to run tests
-        parallel: [0, 1, 2]
+        parallel: [0, 1, 2, 3]
 
     steps:
     - uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
     - name: Generate short list of the test files
       working-directory: ./tests/e2e
       run: |
-        testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 3 == ${{ matrix.parallel }}")
+        testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 4 == ${{ matrix.parallel }}")
         echo $testFiles
 
         # Multi-Line value

package.json

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

yarn.lock

@@ -1190,10 +1190,10 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/[email protected]":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.1.tgz#d0aa6bc43cba830c41bfd840b85dbe0e273f59fe"
-  integrity sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==
+"@electron/[email protected]", "@electron/[email protected]":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.3.2.tgz#20a52a961747be8542a35003380988a0d3fe15e6"
+  integrity sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==
   dependencies:
     debug "^4.1.1"
     fs-extra "^9.0.1"