Remove cache and minor fixes

posit-dev · Feb 13, 2025 · dd53490 · dd53490
1 parent b71f425
commit dd53490
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml
@@ -135,7 +135,7 @@ jobs:
         env:
           POSITRON_PY_VER_SEL: 3.12.3
           POSITRON_R_VER_SEL: 4.4.0
-          POSITRON_PY_ALT_VER_SEL: 3.13.0
+          POSITRON_PY_ALT_VER_SEL: "3.13.0 (Pyenv)"
           POSITRON_R_ALT_VER_SEL: 4.4.2
           CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
           CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}

diff --git a/.github/workflows/test-e2e-release.yml b/.github/workflows/test-e2e-release.yml
@@ -104,7 +104,7 @@ jobs:
         env:
           POSITRON_PY_VER_SEL: 3.12.3
           POSITRON_R_VER_SEL: 4.4.0
-          POSITRON_PY_ALT_VER_SEL: 3.13.0
+          POSITRON_PY_ALT_VER_SEL: "3.13.0 (Pyenv)"
           POSITRON_R_ALT_VER_SEL: 4.4.2
           CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
           CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}

diff --git a/.github/workflows/test-e2e-windows.yml b/.github/workflows/test-e2e-windows.yml
@@ -78,9 +78,6 @@ jobs:
         with:
           python-version: "3.10.10"
 
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
       - name: Install node dependencies
         env:
           npm_config_arch: x64
@@ -139,22 +136,18 @@ jobs:
           rig default 4.4.0
           rig ls
 
-
       - name: Install R packages for 4.4.0
         run: |
           curl https://raw.githubusercontent.com/posit-dev/qa-example-content/main/DESCRIPTION --output DESCRIPTION
           Rscript -e "install.packages('pak')"
           Rscript -e "pak::local_install_dev_deps(ask = FALSE)"
 
-
       # Install R 4.4.2 using rig
       - name: Install R 4.4.2
         run: |
           rig add 4.4.2
           rig ls
 
-
-
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v2.0.2
 

diff --git a/test/e2e/tests/console/console-python.test.ts b/test/e2e/tests/console/console-python.test.ts
@@ -76,10 +76,11 @@ test.describe('Console Pane: Python', { tag: [tags.WEB, tags.CONSOLE] }, () => {
 		const secondaryPython = process.env.POSITRON_PY_ALT_VER_SEL;
 
 		if (secondaryPython) {
-			await app.workbench.interpreter.selectInterpreter(InterpreterType.Python, `${secondaryPython} (Pyenv)`, true);
+			await app.workbench.interpreter.selectInterpreter(InterpreterType.Python, secondaryPython, true);
 			await app.workbench.console.barClearButton.click();
 			await app.workbench.console.pasteCodeToConsole(`import platform; print(platform.python_version())`, true);
-			await app.workbench.console.waitForConsoleContents(secondaryPython);
+			// If POSITRON_PY_ALT_VER_SEL has " (Pyenv)" in it, remove it"
+			await app.workbench.console.waitForConsoleContents(secondaryPython.replace(' (Pyenv)', ''));
 		} else {
 			fail('Secondary Python version not set');
 		}