Merge pull request #1 from homeles/feature-branch1

Removing all the references to Top-Level concurrency which we do not …

Author: homeles

README.md

@@ -2,17 +2,14 @@
 This GitHub Action validates that the concurrency usage across workflows in a repository does not exceed a specified limit. It helps prevent abuse of GitHub's concurrent job limits by analyzing workflow files and detecting potential parallel execution.
 
 ## What it checks
-- Top-level concurrency settings in workflows
-- Job-level concurrency settings
 - Implicit concurrency from jobs that run in parallel (no dependencies)
 - Matrix job combinations
 - Jobs within the same workflow run that can execute in parallel
 
 ## Important Notes
-- Jobs within the same workflow run can execute in parallel even with `cancel-in-progress: true`
-- `cancel-in-progress` only affects concurrent workflow runs, not jobs within the same workflow
-- Matrix jobs are counted by their total number of combinations
 - Dependencies between jobs (`needs:`) are properly analyzed to identify truly parallel execution paths
+- Matrix jobs are counted by their total number of combinations
+- All jobs at the same dependency level will be counted towards parallel execution
 
 ## Installation
 
@@ -334,26 +331,7 @@ The action uses the modern GitHub Actions output method with environment files.
 ### Understanding Concurrency Detection
 The action detects concurrency in several ways:
 
-1. **Explicit workflow-level concurrency**: Set via `concurrency:` at the workflow root
-   - Simple string format: `concurrency: group1`
-   - Object format with cancel-in-progress: 
-     ```yaml
-     concurrency:
-       group: build-group
-       cancel-in-progress: true
-     ```
-   Note: cancel-in-progress only affects concurrent workflow runs, not jobs within the same workflow
-
-2. **Explicit job-level concurrency**: Set via `concurrency:` in individual jobs
-   ```yaml
-   jobs:
-     job1:
-       concurrency: group1
-     job2:
-       concurrency: group2
-   ```
-
-3. **Implicit parallel jobs**: Jobs that can run in parallel based on:
+1. **Implicit parallel jobs**: Jobs that can run in parallel based on:
    - No `needs:` dependencies between them
    - Being in the same dependency level
    Example:
@@ -372,7 +350,7 @@ The action detects concurrency in several ways:
    ```
    Here, `build` and `test` can run in parallel (count: 2), while `deploy` runs after them (different level)
 
-4. **Matrix jobs**: Count based on total combinations
+2. **Matrix jobs**: Count based on total combinations
    ```yaml
    jobs:
      test:
@@ -397,20 +375,7 @@ The action detects concurrency in several ways:
    ```
    Total concurrency: 2 (both jobs can run in parallel)
 
-2. Workflow with cancel-in-progress and parallel jobs:
-   ```yaml
-   concurrency:
-     group: build
-     cancel-in-progress: true
-   jobs:
-     job1:
-       runs-on: ubuntu-latest
-     job2:
-       runs-on: ubuntu-latest
-   ```
-   Total concurrency: 2 (jobs can still run in parallel within the same workflow)
-
-3. Matrix job with dependencies:
+2. Matrix job with dependencies:
    ```yaml
    jobs:
      test:

dist/index.js

@@ -182,16 +182,6 @@ try {
                 return;
             }
             let details = [];
-            // Check if workflow has cancel-in-progress concurrency
-            if (typeof workflow.concurrency === 'object' && workflow.concurrency['cancel-in-progress'] === true) {
-                Logger.info('Note: Workflow has cancel-in-progress concurrency (only affects concurrent workflow runs)');
-                details.push({
-                    file: relativeFilePath,
-                    level: 'workflow',
-                    type: 'cancel-in-progress',
-                    counted: false
-                });
-            }
             // Process each level of parallel jobs for logging
             parallelJobs.forEach((level, index) => {
                 if (level.length > 0) {
@@ -215,8 +205,6 @@ try {
                     }
                     details.push({
                         file: relativeFilePath,
-                        level: 'implicit',
-                        type: 'standard',
                         jobs: level,
                         count: levelConcurrency,
                         counted: true

src/__tests__/validate-concurrency.test.ts

@@ -50,57 +50,28 @@ describe('Workflow Concurrency Validator', () => {
     await new Promise(resolve => setTimeout(resolve, 100));
   }
 
-  test('validates workflow with top-level concurrency', async () => {
-    const workflow = `
-name: Test Workflow
-on: push
-concurrency: group1
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "test"
-`;
-    fs.writeFileSync(path.join(workflowDir, 'test1.yml'), workflow);
-    
-    await runValidator();
-    
-    const output = getGitHubOutput();
-    expect(JSON.parse(output.match(/workflow_results<<.*\n(.*)\n/)?.[1] || '')[0]).toEqual(
-      expect.objectContaining({
-        file: '.github/workflows/test1.yml',
-        concurrencyCount: 1,
-        passed: true
-      })
-    );
-    expect(output).toMatch(/validation_passed<<.*\ntrue\n/);
-    expect(output).toMatch(/total_concurrency<<.*\n0\n/);
-  });
-
-  test('validates workflow with job-level concurrency', async () => {
+  test('validates workflow with parallel jobs', async () => {
     const workflow = `
 name: Test Workflow
 on: push
 jobs:
   test1:
     runs-on: ubuntu-latest
-    concurrency: job1
     steps:
       - run: echo "test"
   test2:
     runs-on: ubuntu-latest
-    concurrency: job2
     steps:
       - run: echo "test"
 `;
-    fs.writeFileSync(path.join(workflowDir, 'test2.yml'), workflow);
+    fs.writeFileSync(path.join(workflowDir, 'test1.yml'), workflow);
 
     await runValidator();
 
     const output = getGitHubOutput();
     expect(JSON.parse(output.match(/workflow_results<<.*\n(.*)\n/)?.[1] || '')[0]).toEqual(
       expect.objectContaining({
-        file: '.github/workflows/test2.yml',
+        file: '.github/workflows/test1.yml',
         concurrencyCount: 2,
         passed: true
       })
@@ -109,53 +80,6 @@ jobs:
     expect(output).toMatch(/total_concurrency<<.*\n0\n/);
   });
 
-  test('validates workflow with cancel-in-progress concurrency', async () => {
-    const workflow = `
-name: Test Workflow
-on: push
-concurrency:
-  group: build
-  cancel-in-progress: true
-jobs:
-  test1:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "test1"
-  test2:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "test2"
-`;
-    fs.writeFileSync(path.join(workflowDir, 'test3.yml'), workflow);
-    
-    await runValidator();
-    
-    const output = getGitHubOutput();
-    expect(JSON.parse(output.match(/workflow_results<<.*\n(.*)\n/)?.[1] || '')[0]).toEqual(
-      expect.objectContaining({
-        file: '.github/workflows/test3.yml',
-        concurrencyCount: 2,
-        passed: true,
-        details: expect.arrayContaining([
-          expect.objectContaining({
-            level: 'workflow',
-            type: 'cancel-in-progress',
-            counted: false
-          }),
-          expect.objectContaining({
-            level: 'implicit',
-            type: 'standard',
-            jobs: ['test1', 'test2'],
-            count: 2,
-            counted: true
-          })
-        ])
-      })
-    );
-    expect(output).toMatch(/validation_passed<<.*\ntrue\n/);
-    expect(output).toMatch(/total_concurrency<<.*\n0\n/);
-  });
-
   test('validates implicit concurrency from parallel jobs', async () => {
     const workflow = `
 name: Test Workflow
@@ -175,14 +99,14 @@ jobs:
     steps:
       - run: echo "test"
 `;
-    fs.writeFileSync(path.join(workflowDir, 'test4.yml'), workflow);
+    fs.writeFileSync(path.join(workflowDir, 'test2.yml'), workflow);
 
     await runValidator();
 
     const output = getGitHubOutput();
     expect(JSON.parse(output.match(/workflow_results<<.*\n(.*)\n/)?.[1] || '')[0]).toEqual(
       expect.objectContaining({
-        file: '.github/workflows/test4.yml',
+        file: '.github/workflows/test2.yml',
         concurrencyCount: 2,
         passed: true
       })
@@ -200,16 +124,14 @@ on: push
 jobs:
   test1:
     runs-on: ubuntu-latest
-    concurrency: job1
     steps:
       - run: echo "test"
   test2:
     runs-on: ubuntu-latest
-    concurrency: job2
     steps:
       - run: echo "test"
 `;
-    fs.writeFileSync(path.join(workflowDir, 'test5.yml'), workflow);
+    fs.writeFileSync(path.join(workflowDir, 'test3.yml'), workflow);
 
     const mockExit = jest.spyOn(process, 'exit').mockImplementation(() => undefined as never);
 
@@ -218,7 +140,7 @@ jobs:
     const output = getGitHubOutput();
     expect(JSON.parse(output.match(/workflow_results<<.*\n(.*)\n/)?.[1] || '')[0]).toEqual(
       expect.objectContaining({
-        file: '.github/workflows/test5.yml',
+        file: '.github/workflows/test3.yml',
         concurrencyCount: 2,
         passed: false
       })
@@ -237,7 +159,6 @@ on: push
 jobs:
   test1:
     runs-on: ubuntu-latest
-    concurrency: job1
     steps:
       - run: echo "test"
 `;
@@ -248,12 +169,10 @@ on: push
 jobs:
   test1:
     runs-on: ubuntu-latest
-    concurrency: job1
     steps:
       - run: echo "test"
   test2:
     runs-on: ubuntu-latest
-    concurrency: job2
     steps:
       - run: echo "test"
 `;

src/validate-concurrency.ts

@@ -3,24 +3,12 @@ import path from 'path';
 import yaml from 'js-yaml';
 import glob from 'glob';
 
-/**
- * Represents the concurrency configuration in a workflow file
- */
-interface WorkflowConcurrency {
-  /** The concurrency group name */
-  group?: string;
-  /** Whether to cancel in-progress runs */
-  'cancel-in-progress'?: boolean;
-}
-
 /**
  * Represents a job in a GitHub Actions workflow file
  */
 interface WorkflowJob {
   /** Dependencies of this job - can be a string or array of strings */
   needs?: string | string[];
-  /** Concurrency configuration for this job */
-  concurrency?: WorkflowConcurrency | string;
   /** Strategy configuration for matrix jobs */
   strategy?: {
     matrix?: Record<string, any>;
@@ -31,8 +19,6 @@ interface WorkflowJob {
  * Represents the structure of a GitHub Actions workflow file
  */
 interface WorkflowFile {
-  /** Top-level concurrency configuration */
-  concurrency?: WorkflowConcurrency | string;
   /** Map of job names to job configurations */
   jobs?: Record<string, WorkflowJob>;
 }
@@ -43,12 +29,6 @@ interface WorkflowFile {
 interface ConcurrencyDetail {
   /** Relative path to the workflow file */
   file: string;
-  /** Name of the job (if job-level concurrency) */
-  job?: string;
-  /** The level at which concurrency is defined */
-  level: 'workflow' | 'job' | 'implicit';
-  /** The type of concurrency configuration */
-  type?: 'standard' | 'cancel-in-progress';
   /** List of job names (for implicit concurrency) */
   jobs?: string[];
   /** Number of concurrent jobs (for implicit concurrency) */
@@ -268,17 +248,6 @@ try {
 
       let details: ConcurrencyDetail[] = [];
 
-      // Check if workflow has cancel-in-progress concurrency
-      if (typeof workflow.concurrency === 'object' && workflow.concurrency['cancel-in-progress'] === true) {
-        Logger.info('Note: Workflow has cancel-in-progress concurrency (only affects concurrent workflow runs)');
-        details.push({
-          file: relativeFilePath,
-          level: 'workflow',
-          type: 'cancel-in-progress',
-          counted: false
-        });
-      }
-      
       // Process each level of parallel jobs for logging
       parallelJobs.forEach((level, index) => {
         if (level.length > 0) {
@@ -305,8 +274,6 @@ try {
 
           details.push({
             file: relativeFilePath,
-            level: 'implicit',
-            type: 'standard',
             jobs: level,
             count: levelConcurrency,
             counted: true