Merge branch 'main' into fix-usersettings-iconclass

SAP · Jan 14, 2025 · ed48d0d · ed48d0d
2 parents 5628cf4 + 4b1c9ab
commit ed48d0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
@@ -20,8 +20,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache
-          key: whitesource_cache-${{ github.ref }}          
-      - run: sudo apt-get install build-essential python2 libgconf-2-4 libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+          key: whitesource_cache-${{ github.ref }}
+      - run: sudo apt-get install build-essential python2 libgtk2.0-0t64 libgtk-3-0t64 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb
       - run: npm --prefix ./client ci ./client
       - run: npm --prefix ./core ci ./core
       - run: npm --prefix ./website/landingpage/dev install ./website/landingpage/dev

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -111,7 +111,7 @@ jobs:
             ~/cypress-binary-cache
           key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
-      - run: sudo apt-get install libgconf-2-4 libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - run: sudo apt-get install libgtk2.0-0t64 libgtk-3-0t64 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb
       - run: npm install --prefix test/e2e-test-application @babel/plugin-proposal-class-properties
       - run: ls test
       - run: bash ./test/e2e-js.sh || exit 1

diff --git a/container/run-container-e2e.sh b/container/run-container-e2e.sh
@@ -19,13 +19,12 @@ killWebserver 2222 || true
 npm run start-examples-test &
 WS_FID_PID=$!
 
-
 # Start the second server for 'test-app' in the background
 npm run start &
 EXAMPLES_FID_PID=$!
 
-# sleep for 3 seconds to wait for both servers to be fired up
-sleep 3
+# sleep for 30 seconds to wait for both servers to be fired up
+sleep 30
 
 if [ "$USE_CYPRESS_DASHBOARD" == "true" ]; then
   echo "Running tests with recording"
@@ -41,4 +40,3 @@ kill $WS_FID_PID
 kill $EXAMPLES_FID_PID
 
 exit $?
-