Assert in hashfiles that executionContext is available

src/Misc/expressionFunc/hashFilesV2/.eslintignore

@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/

src/Misc/expressionFunc/hashFilesV2/.eslintrc.json

@@ -1,61 +0,0 @@
-{
-    "plugins": ["@typescript-eslint"],
-    "extends": ["plugin:github/recommended"],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 9,
-      "sourceType": "module",
-      "project": "./tsconfig.json"
-    },
-    "rules": {
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-console": "off",
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": "error",
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/naming-convention": [
-        "error",
-        {
-          "selector": "default",
-          "format": ["camelCase"]
-        }
-      ],
-      "camelcase": "off",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error",
-      "filenames/match-regex" : "off",
-      "github/no-then" : 1, // warning
-      "semi": "off"
-    },
-    "env": {
-      "node": true,
-      "es6": true
-    }
-  }

src/Misc/expressionFunc/hashFilesV2/.prettierignore

@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/

src/Misc/expressionFunc/hashFilesV2/.prettierrc.json

@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }

src/Misc/expressionFunc/hashFilesV2/README.md

@@ -1,4 +0,0 @@
-To compile this package (output will be stored in `Misc/layoutbin`) run `npm install && npm run all`.
-
-> Note: this package also needs to be recompiled for dependabot PRs updating one of
-> its dependencies.

src/Misc/expressionFunc/hashFilesV2/package.json

@@ -1,36 +0,0 @@
-{
-    "name": "hashFiles",
-    "version": "1.0.0",
-    "description": "GitHub Actions HashFiles() expression function",
-    "main": "lib/hashFiles.js",
-    "scripts": {
-        "build": "tsc",
-        "format": "prettier --write **/*.ts",
-        "format-check": "prettier --check **/*.ts",
-        "lint": "eslint src/**/*.ts",
-        "pack": "ncc build -o ../../layoutbin/hashFilesV2",
-        "all": "npm run build && npm run format && npm run lint && npm run pack"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/actions/runner.git"
-    },
-    "keywords": [
-        "actions"
-    ],
-    "author": "GitHub Actions",
-    "license": "MIT",
-    "dependencies": {
-        "@actions/glob": "^0.4.0"
-    },
-    "devDependencies": {
-        "@types/node": "^12.7.12",
-        "@typescript-eslint/parser": "^5.15.0",
-        "@vercel/ncc": "^0.36.0",
-        "eslint": "^8.11.0",
-        "eslint-plugin-github": "^4.3.5",
-        "eslint-plugin-prettier": "^4.2.1",
-        "prettier": "^2.8.4",
-        "typescript": "^3.6.4"
-    }
-}

src/Misc/expressionFunc/hashFilesV2/src/hashFiles.ts

@@ -1,31 +0,0 @@
-import * as glob from '@actions/glob'
-
-async function run(): Promise<void> {
-  // arg0 -> node
-  // arg1 -> hashFiles.js
-  // env[followSymbolicLinks] = true/null
-  // env[patterns] -> glob patterns
-  let followSymbolicLinks = false
-  const matchPatterns = process.env.patterns || ''
-  if (process.env.followSymbolicLinks === 'true') {
-    console.log('Follow symbolic links')
-    followSymbolicLinks = true
-  }
-  const githubWorkspace = process.cwd()
-  console.log(`Match Pattern: ${matchPatterns}`)
-  try {
-    const result = await glob.hashFiles(
-      matchPatterns,
-      githubWorkspace,
-      {followSymbolicLinks},
-      true
-    )
-    console.error(`__OUTPUT__${result}__OUTPUT__`)
-    process.exit(0)
-  } catch (error) {
-    console.log(error)
-    process.exit(1)
-  }
-}
-
-run()

src/Misc/expressionFunc/hashFilesV2/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "outDir": "./lib",                        /* Redirect output structure to the directory. */
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-  },
-  "exclude": ["node_modules", "**/*.test.ts"]
-}

src/Misc/runnercoreassets

@@ -4,7 +4,6 @@ checkScripts/downloadCert.js
 checkScripts/makeWebRequest.js
 darwin.svc.sh.template
 hashFiles/index.js
-hashFilesV2/index.js
 installdependencies.sh
 macos-run-invoker.js
 Microsoft.IdentityModel.Logging.dll

src/Runner.Common/Constants.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Runner.Common
 {
@@ -156,7 +156,6 @@ namespace GitHub.Runner.Common
                 public static readonly string Node12Warning = "DistributedTask.AddWarningToNode12Action";
                 public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                 public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
-                public static readonly string UseGlobHashFiles = "DistributedTask.UseGlobHashFiles";
             }
 
             public static readonly string InternalTelemetryIssueDataKey = "_internal_telemetry";

src/Runner.Worker/Expressions/HashFilesFunction.cs

@@ -32,6 +32,7 @@ namespace GitHub.Runner.Worker.Expressions
             var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             
+
             string githubWorkspace = workspaceData.Value;
             bool followSymlink = false;
             List<string> patterns = new();
@@ -66,15 +67,7 @@ namespace GitHub.Runner.Worker.Expressions
             string runnerRoot = new DirectoryInfo(binDir).Parent.FullName;
 
             string node = Path.Combine(runnerRoot, "externals", NodeUtil.GetInternalNodeVersion(), "bin", $"node{IOUtil.ExeExtension}");
-            //Feature flag to fetch a new version of hashFiles script
+            string hashFilesScript = Path.Combine(binDir, "hashFiles");
-            string hashFilesScript = string.Empty;
-            var isGlobHashFilesEnabled = executionContext.Global.Variables.GetBoolean("DistributedTask.UseGlobHashFiles") ?? false;
-            if (isGlobHashFilesEnabled)
-            {
-                hashFilesScript = Path.Combine(binDir, "hashFilesV2");
-            }
-            hashFilesScript = Path.Combine(binDir, "hashFiles");
-
             var hashResult = string.Empty;
             var p = new ProcessInvoker(new HashFilesTrace(context.Trace));
             p.ErrorDataReceived += ((_, data) =>

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;