tmp

kabalin · Aug 22, 2024 · bfa3ff9 · bfa3ff9
1 parent c9cd817
commit bfa3ff9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   selftest:
     name: CI test (make validate)
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Check out repository code
@@ -57,8 +57,7 @@ jobs:
 
   citest:
     name: Integration tests
-    needs: selftest
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -181,7 +180,7 @@ jobs:
   phartest:
     name: Integration tests (PHAR)
     needs: buildphar
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:

diff --git a/src/Installer/VendorInstaller.php b/src/Installer/VendorInstaller.php
@@ -15,7 +15,6 @@
 use MoodlePluginCI\Bridge\Moodle;
 use MoodlePluginCI\Bridge\MoodlePlugin;
 use MoodlePluginCI\Process\Execute;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\Process;
 
 /**
@@ -112,16 +111,14 @@ public function canInstallNvm(): bool
      */
     public function installNvm(): void
     {
-        $nvmDir = "{$this->moodle->directory}/.nvm";
-        (new Filesystem())->mkdir($nvmDir);
-        $cmd     = "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | NVM_DIR=\"{$nvmDir}\" bash";
+        $cmd     = 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash';
         $process = $this->execute->passThroughProcess(
             Process::fromShellCommandline($cmd, $this->moodle->directory, null, null, null)
         );
         if (!$process->isSuccessful()) {
             throw new \RuntimeException('nvm installation failed.');
         }
-        putenv('NVM_DIR=' . $nvmDir);
+        putenv('NVM_DIR=$HOME/.nvm');
     }
 
     /**
@@ -155,7 +152,7 @@ public function installNode(): void
         }
 
         $nvmDir  = getenv('NVM_DIR');
-        $cmd     = ". $nvmDir/nvm.sh && nvm install && nvm use && echo \"NVM_BIN=\$NVM_BIN\"";
+        $cmd     = ". {$nvmDir}/nvm.sh && nvm --version";
 
         $process = $this->execute->passThroughProcess(
             Process::fromShellCommandline($cmd, $this->moodle->directory, null, null, null)