Merge branch 'main' into ci-node-26

Author: cristianrgreco

.github/actions/colima-setup/action.yml

@@ -9,57 +9,58 @@ inputs:
     description: "Node.js version to use"
     required: true
   workspace:
-    description: "Key for the cache"
+    description: "Workspace to install"
     required: true
 
 outputs:
   workspace_path:
     description: "Full path to the workspace directory"
-    value: ${{ steps.set-env.outputs.workspace_path }}
+    value: ${{ steps.set-workspace.outputs.workspace_path }}
 
 runs:
   using: "composite"
   steps:
-    - name: Install NodeJS ${{ inputs.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ inputs.node-version }}
-
-    - name: Set cache configuration
+    - name: Set workspace path
       shell: bash
-      id: set-env
+      id: set-workspace
       run: |
         if [ "${{ inputs.workspace }}" = "testcontainers" ]; then
-          echo "CACHE_PATHS<<EOF" >> $GITHUB_ENV
-          echo "node_modules" >> $GITHUB_ENV
-          echo "packages/testcontainers/node_modules" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-          echo "WORKSPACE_PATH=packages/testcontainers" >> $GITHUB_ENV
-          echo "workspace_path=packages/testcontainers" >> "$GITHUB_OUTPUT"
+          workspace_path="packages/testcontainers"
+          cache_paths=$'node_modules\npackages/testcontainers/node_modules'
         else
-          echo "CACHE_PATHS<<EOF" >> $GITHUB_ENV
-          echo "node_modules" >> $GITHUB_ENV
-          echo "packages/testcontainers/node_modules" >> $GITHUB_ENV
-          echo "packages/modules/${{ inputs.workspace }}/node_modules" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-          echo "WORKSPACE_PATH=packages/modules/${{ inputs.workspace }}" >> $GITHUB_ENV
-          echo "workspace_path=packages/modules/${{ inputs.workspace }}" >> "$GITHUB_OUTPUT"
+          workspace_path="packages/modules/${{ inputs.workspace }}"
+          cache_paths=$'node_modules\npackages/testcontainers/node_modules\n'"${workspace_path}/node_modules"
         fi
 
-    - uses: actions/cache/restore@v4
+        echo "WORKSPACE_PATH=${workspace_path}" >> "$GITHUB_ENV"
+        echo "workspace_path=${workspace_path}" >> "$GITHUB_OUTPUT"
+        {
+          echo "cache_paths<<EOF"
+          echo "${cache_paths}"
+          echo "EOF"
+        } >> "$GITHUB_OUTPUT"
+
+    - name: Install NodeJS ${{ inputs.node-version }}
+      uses: actions/setup-node@v6
+      with:
+        node-version: ${{ inputs.node-version }}
+        package-manager-cache: false
+
+    - name: Restore dependencies cache
+      uses: actions/cache/restore@v4
       id: npm-cache
       with:
-        path: ${{ env.CACHE_PATHS }}
-        key: ${{ inputs.runner }}-node-${{ inputs.node-version }}-${{ inputs.workspace }}-${{ hashFiles('package-lock.json') }}
+        path: ${{ steps.set-workspace.outputs.cache_paths }}
+        key: npm-v2-${{ inputs.runner }}-node-${{ inputs.node-version }}-${{ inputs.workspace }}-${{ hashFiles('package-lock.json') }}
 
     - name: Install dependencies
       if: steps.npm-cache.outputs.cache-hit != 'true'
       shell: bash
-      run: npm ci --workspace ${{ env.WORKSPACE_PATH }} --include-workspace-root
+      run: npm ci --workspace "${WORKSPACE_PATH}" --include-workspace-root
 
-    - name: Cache npm
+    - name: Save dependencies cache
       if: steps.npm-cache.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
-        path: ${{ env.CACHE_PATHS }}
+        path: ${{ steps.set-workspace.outputs.cache_paths }}
         key: ${{ steps.npm-cache.outputs.cache-primary-key }}

.github/actions/docker-rootless-setup/action.yml

@@ -3,15 +3,19 @@ description: "Sets up Podman"
 runs:
   using: "composite"
   steps:
-    - name: Podman setup
+    - name: Verify Podman
+      shell: bash
+      run: podman --version
+
+    - name: Configure Podman
       shell: bash
       run: |
-        curl -fsSL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key" | gpg --dearmor | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
-        echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
-        sudo apt-get update
-        sudo apt-get -y install podman
-        systemctl enable --now --user podman podman.socket
-        podman info
-        echo "DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV
-        echo "CI_ROOTLESS=true" >> $GITHUB_ENV
+        PODMAN_SOCKET="${RUNNER_TEMP:-/tmp}/podman.sock"
+
+        sudo mkdir -p /etc/systemd/system/podman.socket.d
+        printf '[Socket]\nListenStream=\nListenStream=%s\nSocketUser=%s\nSocketMode=0600\n' "${PODMAN_SOCKET}" "$(id -un)" | sudo tee /etc/systemd/system/podman.socket.d/runner.conf
+        sudo systemctl daemon-reload
+        sudo systemctl restart podman.socket
+        podman --url="unix://${PODMAN_SOCKET}" info
+        echo "DOCKER_HOST=unix://${PODMAN_SOCKET}" >> $GITHUB_ENV
         echo "CI_PODMAN=true" >> $GITHUB_ENV

.github/actions/npm-setup/action.yml

@@ -0,0 +1,65 @@
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import process from "node:process";
+import { fileURLToPath } from "node:url";
+
+const rootDir = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
+
+const ignoredPaths = [
+  /^README\.md$/,
+  /^docs\//,
+  /^mkdocs\.yml$/,
+  /^\.github\/FUNDING\.yml$/,
+  /^\.github\/ISSUE_TEMPLATE\//,
+  /^\.github\/release-drafter\.yml$/,
+];
+
+const allPackagesPaths = [
+  /^packages\/testcontainers\//,
+  /^package(-lock)?\.json$/,
+  /^tsconfig\.base\.json$/,
+  /^eslint\.config\.js$/,
+  /^vitest\.config\.ts$/,
+  /^\.npmrc$/,
+  /^\.github\/actions\//,
+  /^\.github\/scripts\//,
+  /^\.github\/workflows\/(checks|test-template)\.yml$/,
+];
+
+const changedFiles = readFileSync(0, "utf8")
+  .split(/\r?\n/)
+  .map((file) => file.trim())
+  .filter(Boolean);
+
+const modulesDir = resolve(rootDir, "packages/modules");
+const moduleNames = new Set(
+  readdirSync(modulesDir, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory())
+    .filter((entry) => existsSync(resolve(modulesDir, entry.name, "package.json")))
+    .map((entry) => entry.name)
+);
+
+const allPackages = () => ["testcontainers", ...moduleNames].sort();
+const selectedPackages = new Set();
+
+for (const file of changedFiles) {
+  if (ignoredPaths.some((pattern) => pattern.test(file))) {
+    continue;
+  }
+
+  const moduleMatch = file.match(/^packages\/modules\/([^/]+)\//);
+  if (moduleMatch) {
+    const moduleName = moduleMatch[1];
+    if (moduleNames.has(moduleName)) {
+      selectedPackages.add(moduleName);
+    }
+    continue;
+  }
+
+  if (allPackagesPaths.some((pattern) => pattern.test(file))) {
+    process.stdout.write(`${JSON.stringify(allPackages())}\n`);
+    process.exit(0);
+  }
+}
+
+process.stdout.write(`${JSON.stringify([...selectedPackages].sort())}\n`);