chore: run from artefact url

Bilb · Bilb · commit 07fd1dfc3681 · 2025-06-06T16:34:33.000+10:00
diff --git a/.github/workflows/desktop-regression.yml b/.github/workflows/desktop-regression.yml
@@ -2,37 +2,11 @@ name: Run desktop regression tests
 on:
   workflow_dispatch:
     inputs:
-      PLAYWRIGHT_REPO:
-        description: 'Playwright repo to checkout'
-        required: true
-        type: choice
-        options:
-          - session-foundation/session-playwright
-          - burtonemily/session-playwright
-          - bilb/session-playwright
-        default: session-foundation/session-playwright
-
-      BRANCH_TO_CHECKOUT_PW:
-        description: 'branch to checkout on session-playwright'
+      DESKTOP_JOB_URL:
+        description: 'URL of the job on session-foundation/session-desktop'
         required: true
         type: string
-        default: regression-tests-groups
-
-      SESSION_DESKTOP_REPO:
-        description: 'Session desktop repo to checkout'
-        required: true
-        type: choice
-        options:
-          - session-foundation/session-desktop
-          - bilb/session-desktop
-          - yougotwill/session-desktop
-        default: session-foundation/session-desktop
-
-      BRANCH_TO_CHECKOUT_SESSION:
-        description: 'Branch to checkout on session-desktop'
-        required: true
-        type: string
-        default: dev
+        default: https://github.com/session-foundation/session-desktop/actions/runs/15481004324
 
       PLAYWRIGHT_REPEAT_COUNT:
         description: 'Repeats of each tests (0 to only run each once)'
@@ -50,7 +24,7 @@ on:
         description: 'Playwright workers to start'
         required: true
         type: number
-        default: 8
+        default: 1
 
 concurrency:
   group: ${{ github.workflow }}
@@ -65,105 +39,82 @@ jobs:
       options: --cpus 16
 
     env:
+      PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
       PLAYWRIGHT_REPEAT_COUNT: ${{ github.event.inputs.PLAYWRIGHT_REPEAT_COUNT }}
       PLAYWRIGHT_RETRIES_COUNT: ${{ github.event.inputs.PLAYWRIGHT_RETRIES_COUNT }}
       PLAYWRIGHT_WORKERS_COUNT: ${{ github.event.inputs.PLAYWRIGHT_WORKERS_COUNT }}
-      DESKTOP_CACHED_FOLDER: desktop/node_modules
+      DESKTOP_JOB_URL: ${{ github.event.inputs.DESKTOP_JOB_URL }}
+      ARTIFACT_NAME: 'Linux-X64-AppImage-qa-production'
+      CI: true
 
     steps:
-      - uses: actions/checkout@v4
       - name: Runner Details
         run: |
-          echo "PLAYWRIGHT_REPO ${{ github.event.inputs.PLAYWRIGHT_REPO }}"
-          echo "BRANCH_TO_CHECKOUT_PW ${{ github.event.inputs.BRANCH_TO_CHECKOUT_PW }}"
-          echo "SESSION_DESKTOP_REPO ${{ github.event.inputs.SESSION_DESKTOP_REPO }}"
-          echo "BRANCH_TO_CHECKOUT_SESSION ${{ github.event.inputs.BRANCH_TO_CHECKOUT_SESSION }}"
-
-      - uses: actions/checkout@v4
-        name: 'Checkout playwright'
-        with:
-          repository: ${{ github.event.inputs.PLAYWRIGHT_REPO }}
-          ref: ${{ github.event.inputs.BRANCH_TO_CHECKOUT_PW }}
-          path: 'playwright'
+          echo "DESKTOP_JOB_URL ${{ github.event.inputs.DESKTOP_JOB_URL }}"
+          echo "PLAYWRIGHT_REPEAT_COUNT ${{ github.event.inputs.PLAYWRIGHT_REPEAT_COUNT }}"
+          echo "PLAYWRIGHT_RETRIES_COUNT ${{ github.event.inputs.PLAYWRIGHT_RETRIES_COUNT }}"
+          echo "PLAYWRIGHT_WORKERS_COUNT ${{ github.event.inputs.PLAYWRIGHT_WORKERS_COUNT }}"
 
-      - name: Install system deps
-        run: apt update && apt install -y git g++ build-essential cmake
+      - name: Install git lfs
+        run: |
+          apt-get update && \
+          apt-get install -y git-lfs unzip jq && \
+          git lfs install
 
       - uses: actions/checkout@v4
-        name: 'Checkout Session desktop'
         with:
-          repository: ${{ github.event.inputs.SESSION_DESKTOP_REPO }}
-          ref: ${{ github.event.inputs.BRANCH_TO_CHECKOUT_SESSION }}
-          path: 'desktop'
+          lfs: true
 
-      # Note: caching is breaking things up (app doesn't start)
-      # - name: Calculate desktop cache key
-      #   run: |
-      #     echo "CACHE_KEY=${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('desktop/package.json', 'desktop/yarn.lock', 'desktop/patches/**') }}" >> $GITHUB_ENV
+      - name: 'Download prebuilt session-desktop'
+        run: |
+          RUN_ID=$(echo "$DESKTOP_JOB_URL" | sed -E 's|.*/runs/([0-9]+).*|\1|')
+          echo "Run ID: $RUN_ID"
 
-      - name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: 'desktop/.nvmrc'
+          response=$(curl -s -H "Authorization: Bearer $PAT_TOKEN" \
+            -H "Accept: application/vnd.github+json" \
+            "https://api.github.com/repos/session-foundation/session-desktop/actions/runs/$RUN_ID/artifacts")
+          echo "response: $response"
 
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.12'
+          artifact_url=$(echo "$response" | jq -r \
+            --arg name "$ARTIFACT_NAME" \
+            '.artifacts[] | select(.name == $name) | .archive_download_url')
 
-      - name: Install setuptools for python 3.12
-        shell: bash
-        run: python -m pip install --upgrade pip setuptools
 
-      # Note: caching is breaking things up (app doesn't start)
-      # - uses: actions/cache/restore@v4
-      #   id: cache-desktop-modules
-      #   with:
-      #     path: ${{ env.DESKTOP_CACHED_FOLDER }}
-      #     key: ${{ env.CACHE_KEY }}
+          echo "Session desktop Artifact URL: $artifact_url"
 
-      - name: Install yarn
-        run: |
-          npm install -g yarn
+          curl -L \
+            -H "Authorization: token $PAT_TOKEN" \
+            -H "Accept: application/vnd.github+json" \
+            -o artifact.zip \
+            $artifact_url
 
-      - name: List desktop folder
-        run: |
-          pwd
-          ls -la desktop
+          unzip artifact.zip
 
-      - name: List playwright folder
+      - name: 'print files'
         run: |
-          pwd
-          ls -la playwright
-
-      - name: Install desktop dependencies
-        shell: bash
-        # if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
-        run: cd $GITHUB_WORKSPACE/desktop && yarn install --frozen-lockfile --network-timeout 600000
+          ls -l
 
-      # Note: caching is breaking things up (app doesn't start)
-      # - uses: actions/cache/save@v4
-      #   if: always()
-      #   with:
-      #     path: ${{ env.DESKTOP_CACHED_FOLDER }}
-      #     key: ${{ env.CACHE_KEY }}
+      - name: Install node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
 
-      - name: Build desktop
-        shell: bash
-        run: cd $GITHUB_WORKSPACE/desktop && yarn build-everything
+      - name: Install yarn
+        run: |
+          npm install -g yarn
 
-      - name: Install playwright dependencies
+      - name: Install dependencies
         run: |
-          cd $GITHUB_WORKSPACE/playwright && yarn install --frozen-lockfile
+          yarn install --frozen-lockfile
 
       - name: Build the Desktop tests
         run: |
-          cd  $GITHUB_WORKSPACE/playwright
+          cd  $GITHUB_WORKSPACE
           yarn tsc
 
       - name: Run the Desktop tests
         run: |
-          cd $GITHUB_WORKSPACE/playwright
-          SESSION_DESKTOP_ROOT=$GITHUB_WORKSPACE/desktop nice ionice xvfb-run --auto-servernum --server-num=1 --server-args='-screen 0, 1920x1080x24' yarn test
+          DEBUG="pw:*" PRINT_ONGOING_TESTS=1 SESSION_DESKTOP_ROOT=$GITHUB_WORKSPACE/desktop nice ionice xvfb-run --auto-servernum --server-num=1 --server-args='-screen 0, 1920x1080x24' yarn test
           # DEBUG="pw:*"
 
       - name: Kill all running electron app
diff --git a/tests/automation/setup/open.ts b/tests/automation/setup/open.ts
@@ -26,20 +26,20 @@ const openElectronAppOnly = async (multi: string) => {
   process.env.NODE_ENV = NODE_ENV;
   process.env.SESSION_DEBUG = '1';
 
-  // if (!isEmpty(process.env.CI)) {
-  //   const sessionBinPath = getSessionDesktopBinPath();
-  //   const fakeHome = `/tmp/${process.env.NODE_APP_INSTANCE}`;
+  if (!isEmpty(process.env.CI)) {
+    const sessionBinPath = './session-desktop-linux-x86_64-1.16.2.AppImage';
+    const fakeHome = `/tmp/${process.env.NODE_APP_INSTANCE}`;
 
-  //   console.info(`   CI RUN`);
-  //   console.info(`   SESSION_BIN_PATH=${sessionBinPath}`);
-  //   console.info(`   HOME="${fakeHome}"`);
+    console.info(`   CI RUN`);
+    console.info(`   SESSION_BIN_PATH=${sessionBinPath}`);
+    console.info(`   HOME="${fakeHome}"`);
 
-  //   process.env.HOME = fakeHome;
+    process.env.HOME = fakeHome;
 
-  //   return electron.launch({
-  //     executablePath: sessionBinPath,
-  //   });
-  // }
+    return electron.launch({
+      executablePath: sessionBinPath,
+    });
+  }
   console.info(`   NON CI RUN`);
   console.info('   NODE_ENV', process.env.NODE_ENV);
   console.info('   NODE_APP_INSTANCE', process.env.NODE_APP_INSTANCE);
