Fix Monterey incompat

45decac397
Use dotnet 3.1 compat syntax
2025-12-10 12:36:23 +00:00 · 2023-01-30 20:07:46 +00:00 · 2023-01-30 19:45:27 +00:00 · 2023-01-30 17:01:26 +01:00 · 2023-01-30 16:58:47 +01:00 · 2022-09-20 14:22:36 -04:00
85 changed files with 1079 additions and 29117 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
          devScript: ./dev.sh

        - runtime: win-x64
-          os: windows-latest
+          os: windows-2019
          devScript: ./dev

    runs-on: ${{ matrix.os }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -72,7 +72,7 @@ jobs:
          devScript: ./dev.sh

        - runtime: win-x64
-          os: windows-latest
+          os: windows-2019
          devScript: ./dev

    runs-on: ${{ matrix.os }}
@@ -164,6 +164,7 @@ jobs:
        release_name: "v${{ steps.releaseNote.outputs.version }}"
        body: |
          ${{ steps.releaseNote.outputs.note }}
+        prerelease: true

    # Upload release assets
    - name: Upload Release Asset (win-x64)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 # GitHub Actions Runner

 [![Actions Status](https://github.com/actions/runner/workflows/Runner%20CI/badge.svg)](https://github.com/actions/runner/actions)
-[![Runner E2E Test](https://github.com/actions/runner/workflows/Runner%20E2E%20Test/badge.svg)](https://github.com/actions/runner/actions)
+[![Runner E2E Test](https://github.com/actions-canary/actions-runner-e2e/actions/workflows/runner_e2etest.yml/badge.svg)](https://github.com/actions-canary/actions-runner-e2e/actions/workflows/runner_e2etest.yml)

 The runner is the application that runs a job from a GitHub Actions workflow. It is used by GitHub Actions in the [hosted virtual environments](https://github.com/actions/virtual-environments), or you can [self-host the runner](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-self-hosted-runners) in your own environment.

--- a/docs/adrs/1438-conditional-composite.md
+++ b/docs/adrs/1438-conditional-composite.md
@@ -0,0 +1,71 @@
+# ADR 1438: Support Conditionals In Composite Actions
+
+**Date**: 2021-10-13
+
+**Status**: Accepted
+
+## Context
+
+We recently shipped composite actions, which allows you to reuse individual steps inside an action. 
+However, one of the [most requested features](https://github.com/actions/runner/issues/834) has been a way to support the `if` keyword.
+
+### Goals
+- We want to keep consistent with current behavior
+- We want to support conditionals via the `if` keyword
+- Our built in functions like `success` should be implementable without calling them, for example you can do `job.status == success` rather then `success()` currently.
+
+### How does composite currently work?
+
+Currently, we have limited conditional support in composite actions for `pre` and `post` steps. 
+These are based on the `job status`, and support keywords like `always()`, `failed()`, `success()` and `cancelled()`. 
+However, generic or main steps do **not** support conditionals.
+
+By default, in a regular workflow, a step runs on the `success()` condition. Which looks at the **job** **status**, sees if it is successful and runs.
+
+By default, in a composite action, main steps run until a single step fails in that composite action, then the composite action is halted early. It does **not** care about the job status.
+Pre, and post steps in composite actions use the job status to determine if they should run.
+
+### How do we go forward?
+
+Well, if we think about what composite actions are currently doing when invoking main steps, they are checking if the current composite action is successful. 
+Lets formalize that concept into a "real" idea.
+
+- We will add an `action_status` field to the github context to mimic the [job's context status](https://docs.github.com/en/actions/learn-github-actions/contexts#job-context).
+  - We have an existing concept that does this `action_path` which is only set for composite actions on the github context.
+- In a composite action during a main step, the `success()` function will check if `action_status == success`, rather then `job_status == success`. Failure will work the same way. 
+  - Pre and post steps in composite actions will not change, they will continue to check the job status.
+
+
+### Nested Scenario
+For nested composite actions, we will follow the existing behavior, you only care about your current composite action, not any parents. 
+For example, lets imagine a scenario with a simple nested composite action
+
+```
+- Job
+  - Regular Step
+  - Composite Action
+    - runs: exit 1
+    - if: always()
+      uses: A child composite action
+        - if: success()
+          runs: echo "this should print"
+        - runs: echo "this should also print"
+    - if: success()
+      runs: echo "this will not print as the current composite action has failed already"
+      
+```
+The child composite actions steps should run in this example, the child composite action has not yet failed, so it should run all steps until a step fails. This is consistent with how a composite action currently works in production if the main job fails but a composite action is invoked with `if:always()` or `if: failure()`
+
+### Other options explored
+We could add the `current_step_status` to the job context rather then `__status` to the steps context, however this comes with two major downsides:
+- We need to support the field for every type of step, because its non trivial to remove a field from the job context once it has been added (its readonly)
+  - For all actions besides composite it would only every be `success`
+  - Its weird to have a `current_step` value on the job context
+- We also explored a `__status` on the steps context.
+  - The `__` is required to prevent us from colliding with a step with id: status
+  - This felt wrong because the naming was not smooth, and did not fit into current conventions.
+
+### Consequences
+- github context has a new field for the status of the current composite action.
+- We support conditional's in composite actions
+- We keep the existing behavior for all users, but allow them to expand that functionality.
--- a/job.yml
+++ b/job.yml
@@ -1,74 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: pod-admin
-  namespace: default
-rules:
-  - apiGroups: [""]
-    resources: ["pods", "pods/log", "pods/attach", "pods/exec"]
-    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: default-pod-admin
-  namespace: default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: pod-admin
-subjects:
-  - kind: ServiceAccount
-    name: default
-    namespace: default
-
---
-apiVersion: batch/v1
-kind: Job
-metadata:
-  namespace: default
-  name: actions-runners
-spec:
-  template:
-    spec:
-      # hostNetwork: true
-      volumes:
-        - name: runner-working
-          emptyDir: {}
-      containers:
-        - name: k8srunner
-          image: huangtingluo/kube-runner:v0
-          imagePullPolicy: Always
-          volumeMounts:
-            - mountPath: /actions-runner/_work
-              name: runner-working
-          env:
-            - name: GITHUB_PAT
-              value: ghp_
-            - name: RUNNER_CONFIG_URL
-              value: https://github.com/bbq-beets/ting-test
-            - name: K8S_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            - name: K8S_POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: K8S_POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: K8S_POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: K8S_POD_SERVICE_ACCOUNT
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.serviceAccountName
-      restartPolicy: Never
-  backoffLimit: 1
-  completions: 1
-  parallelism: 1
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,11 +1,18 @@
 ## Features

+- n/a
+
 ## Bugs

- Fixed an issue where ephemeral runners did not restart after upgrading (#1396)
+- Fixed an issue where container environment variables names or values could escape the docker command (#2108)
+- Sanitize Windows ENVs (#2280)
+

 ## Misc

+- n/a
+
+
 ## Windows x64
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.

--- a/2
+++ b/2
@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.285.3
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -1,78 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:3.1 AS Build
-
-# ENV RUNNER_CONFIG_URL=""
-# ENV GITHUB_PAT=""
-# ENV RUNNER_NAME=""
-# ENV RUNNER_GROUP=""
-# ENV RUNNER_LABELS=""
-# ENV GITHUB_RUNNER_SCOPE=""
-# ENV GITHUB_SERVER_URL=""
-# ENV GITHUB_API_URL=""
-# ENV K8S_HOST_IP=""
-
-RUN apt-get update --fix-missing \
-    && apt-get install -y --no-install-recommends \
-    curl \
-    # jq \
-    # git \
-    apt-utils \
-    apt-transport-https \
-    unzip \
-    net-tools\
-    gnupg2\
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install kubectl
-# RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
-#     echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list && \
-#     apt-get update && apt-get -y install --no-install-recommends kubectl
-
-# Install docker
-# RUN curl -fsSL https://get.docker.com -o get-docker.sh
-# RUN sh get-docker.sh
-
-# Allow runner to run as root
-# ENV RUNNER_ALLOW_RUNASROOT=1
-
-# Directory for runner to operate in
-RUN mkdir /actions-runner
-RUN mkdir /actions-runner/src
-WORKDIR /actions-runner/src
-
-COPY ./ /actions-runner/src
-
-RUN /actions-runner/src/dev.sh l
-
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1
-
-ENV RUNNER_CONFIG_URL=""
-ENV GITHUB_PAT=""
-
-RUN apt-get update --fix-missing \
-    && apt-get install -y --no-install-recommends \
-    curl \
-    # jq \
-    # git \
-    # apt-utils \
-    # apt-transport-https \
-    # unzip \
-    # net-tools\
-    gnupg2\
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install kubectl
-RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
-    echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list && \
-    apt-get update && apt-get -y install --no-install-recommends kubectl
-
-
-# Allow runner to run as root
-ENV RUNNER_ALLOW_RUNASROOT=1
-
-# Directory for runner to operate in
-RUN mkdir /actions-runner
-WORKDIR /actions-runner
-COPY --from=Build /actions-runner/_layout /actions-runner
-ENTRYPOINT ["./entrypoint.sh"] 
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/.eslintignore
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/.eslintignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/.eslintrc.json
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/.eslintrc.json
@@ -1,59 +0,0 @@
-{
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/es6"],
-    "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/ban-ts-ignore": "error",
-      "camelcase": "off",
-      "@typescript-eslint/camelcase": "error",
-      "@typescript-eslint/class-name-casing": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"],
-      "@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-object-literal-type-assertion": "error",
-      "@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-interface": "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",
-      "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
-    }
-  }
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/.prettierignore
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/.prettierignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/.prettierrc.json
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/.prettierrc.json
@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/README.md
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/README.md
@@ -1 +0,0 @@
-To update kubeInnerHandler under `Misc/layoutbin` run `npm install && npm run all`
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/package-lock.json
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/package-lock.json
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/package.json
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/package.json
@@ -1,36 +0,0 @@
-{
-  "name": "kubeInnerHandler",
-  "version": "1.0.0",
-  "description": "GitHub Actions",
-  "main": "lib/kubeInnerHandler.js",
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write **/*.ts",
-    "format-check": "prettier --check **/*.ts",
-    "lint": "eslint src/**/*.ts",
-    "pack": "ncc build -o ../../layoutbin/kubeInnerHandler",
-    "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/exec": "^1.1.0",
-    "@actions/core": "^1.6.0"
-  },
-  "devDependencies": {
-    "@types/node": "^12.7.12",
-    "@typescript-eslint/parser": "^2.8.0",
-    "@zeit/ncc": "^0.20.5",
-    "eslint": "^6.8.0",
-    "eslint-plugin-github": "^2.0.0",
-    "prettier": "^1.19.1",
-    "typescript": "^3.6.4"
-  }
-}
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/src/kubeInnerHandler.ts
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/src/kubeInnerHandler.ts
@@ -1,49 +0,0 @@
-import * as exec from '@actions/exec'
-import * as core from '@actions/core'
-import * as events from 'events'
-import * as readline from 'readline'
-
-async function run(): Promise<void> {
-  let input = ''
-
-  const rl = readline.createInterface({
-    input: process.stdin
-  })
-
-  rl.on('line', line => {
-    core.debug(`Line from STDIN: ${line}`)
-    input = line
-  })
-
-  await events.once(rl, 'close')
-
-  core.debug(input)
-
-  const execInput = JSON.parse(input)
-  core.debug(JSON.stringify(execInput))
-
-  // podman exec -i --workdir /__w/canary/canary
-  // -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY
-  // -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER
-  // -e GITHUB_RETENTION_DAYS -e GITHUB_RUN_ATTEMPT -e GITHUB_ACTOR
-  // -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME
-  // -e GITHUB_SERVER_URL -e GITHUB_API_URL -e GITHUB_GRAPHQL_URL
-  // -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e GITHUB_ACTION_REPOSITORY
-  // -e GITHUB_ACTION_REF -e GITHUB_PATH -e GITHUB_ENV -e RUNNER_DEBUG
-  // -e RUNNER_OS -e RUNNER_NAME -e RUNNER_TOOL_CACHE
-  // -e RUNNER_TEMP -e RUNNER_WORKSPACE
-  //   eccdf520697a035599d6e8c8dc801f004fdd3797cdce88f590aba3669a88d9bc sh -e /__w/_temp/d3b30383-719c-4e76-a16f-8f85443352be.sh
-
-  const execArgs = []
-  const args = (<string>execInput.arguments).split(' ')
-  core.debug(JSON.stringify(args))
-  execArgs.push(...args)
-
-  core.debug(JSON.stringify(execArgs))
-
-  await exec.exec(execInput.fileName, execArgs, {
-    env: execInput.environmentVariables
-  })
-}
-
-run()
--- a/src/Misc/containerEngineHandlers/kubeInnerHandler/tsconfig.json
+++ b/src/Misc/containerEngineHandlers/kubeInnerHandler/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"]
-}
--- a/src/Misc/containerEngineHandlers/kubectlHandler/.eslintignore
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/.eslintignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/kubectlHandler/.eslintrc.json
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/.eslintrc.json
@@ -1,59 +0,0 @@
-{
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/es6"],
-    "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/ban-ts-ignore": "error",
-      "camelcase": "off",
-      "@typescript-eslint/camelcase": "error",
-      "@typescript-eslint/class-name-casing": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"],
-      "@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-object-literal-type-assertion": "error",
-      "@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-interface": "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",
-      "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
-    }
-  }
--- a/src/Misc/containerEngineHandlers/kubectlHandler/.prettierignore
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/.prettierignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/kubectlHandler/.prettierrc.json
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/.prettierrc.json
@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
--- a/src/Misc/containerEngineHandlers/kubectlHandler/README.md
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/README.md
@@ -1 +0,0 @@
-To update kubectlHandler under `Misc/layoutbin` run `npm install && npm run all`
--- a/src/Misc/containerEngineHandlers/kubectlHandler/package-lock.json
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/package-lock.json
--- a/src/Misc/containerEngineHandlers/kubectlHandler/package.json
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/package.json
@@ -1,36 +0,0 @@
-{
-  "name": "kubectlHandler",
-  "version": "1.0.0",
-  "description": "GitHub Actions",
-  "main": "lib/kubectlHandler.js",
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write **/*.ts",
-    "format-check": "prettier --check **/*.ts",
-    "lint": "eslint src/**/*.ts",
-    "pack": "ncc build -o ../../layoutbin/kubectlHandler",
-    "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/exec": "^1.1.0",
-    "@actions/core": "^1.6.0"
-  },
-  "devDependencies": {
-    "@types/node": "^12.7.12",
-    "@typescript-eslint/parser": "^2.8.0",
-    "@zeit/ncc": "^0.20.5",
-    "eslint": "^6.8.0",
-    "eslint-plugin-github": "^2.0.0",
-    "prettier": "^1.19.1",
-    "typescript": "^3.6.4"
-  }
-}
--- a/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts
@@ -1,156 +0,0 @@
-import * as exec from '@actions/exec'
-import * as core from '@actions/core'
-import * as events from 'events'
-import * as readline from 'readline'
-
-async function run(): Promise<void> {
-  let input = ''
-
-  const rl = readline.createInterface({
-    input: process.stdin
-  })
-
-  rl.on('line', line => {
-    core.debug(`Line from STDIN: ${line}`)
-    input = line
-  })
-
-  await events.once(rl, 'close')
-
-  core.debug(input)
-
-  const inputJson = JSON.parse(input)
-  core.debug(JSON.stringify(inputJson))
-
-  const command = inputJson.command
-  if (command === 'Create') {
-    const creationInput = inputJson.creationInput
-    core.debug(JSON.stringify(creationInput))
-    const containers = creationInput.containers
-    const jobContainer = containers[0]
-
-    // const networkName = 'actions_podman_network'
-    // // podman network create {network}  -> track and return `network` for ${{job.container.network}}
-    // await exec.exec('podman', ['network', 'create', networkName])
-
-    const containerImage = `${jobContainer.containerImage}`
-    // podman pull docker.io/library/{image}
-    // await exec.exec('podman', ['pull', containerImage])
-
-    // kubectl run e088c842be1f46b394212618408aaba0_node1016jessie_6196c9
-    //      --image=node:10.16-jessie
-    //      -- tail -f /dev/null
-    const runArgs = ['run', 'job-container']
-    // runArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`)
-    // runArgs.push(`--network=${networkName}`)
-
-    // for (const mountVolume of jobContainer.mountVolumes) {
-    //   runArgs.push(
-    //     `-v=${mountVolume.sourceVolumePath}:${mountVolume.targetVolumePath}`
-    //   )
-    // }
-    runArgs.push(`--image=${containerImage}`)
-    runArgs.push(`--`)
-    runArgs.push(`tail`)
-    runArgs.push(`-f`)
-    runArgs.push(`/dev/null`)
-
-    core.debug(JSON.stringify(runArgs))
-
-    // const containerId = await exec.getExecOutput('podman', [
-    //   'create',
-    //   // `--workdir ${jobContainer.containerWorkDirectory}`,
-    //   `--network=${networkName}`,
-    //   // `-v=/Users/ting/Desktop/runner/_layout/_work:/__w`,
-    //   `--entrypoint=${jobContainer.containerEntryPoint}`,
-    //   `${containerImage}`,
-    //   `${jobContainer.containerEntryPointArgs}`
-    // ])
-
-    await exec.exec('kubectl', runArgs)
-
-    // get PATH inside the container
-
-    const waitArgs = ['wait', '--for=condition=Ready', 'pod/job-container']
-    await exec.exec('kubectl', waitArgs)
-
-    // output containerId for ${{job.container.id}}
-
-    // copy over node.js
-    const cpNodeArgs = [
-      'cp',
-      '/actions-runner/externals/node12/bin',
-      'job-container:/__runner_util/'
-    ]
-    await exec.exec('kubectl', cpNodeArgs)
-
-    // copy over innerhandler
-    const cpKubeInnerArgs = [
-      'cp',
-      '/actions-runner/bin/kubeInnerHandler',
-      'job-container:/__runner_util/kubeInnerHandler'
-    ]
-    await exec.exec('kubectl', cpKubeInnerArgs)
-
-    // copy over _work
-    const cpWorkArgs = ['cp', '/actions-runner/_work', 'job-container:/__w/']
-    await exec.exec('kubectl', cpWorkArgs)
-
-    const creationOutput = {
-      JobContainerId: 'job-container',
-      Network: 'job-container'
-    }
-
-    const output = JSON.stringify({CreationOutput: creationOutput})
-    core.debug(output)
-
-    process.stderr.write(
-      `___CONTAINER_ENGINE_HANDLER_OUTPUT___${output}___CONTAINER_ENGINE_HANDLER_OUTPUT___`
-    )
-  } else if (command === 'Remove') {
-    const removeInput = inputJson.removeInput
-    core.debug(JSON.stringify(removeInput))
-    // const jobContainerId = removeInput.jobContainerId
-
-    // await exec.exec('kubectl', ['delete', 'pod', jobContainerId, '--force'])
-    // await exec.exec('podman', ['network', 'rm', '-f', network])
-  } else if (command === 'Exec') {
-    const execInput = inputJson.execInput
-    core.debug(JSON.stringify(execInput))
-
-    // podman exec -i --workdir /__w/canary/canary
-    // -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY
-    // -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER
-    // -e GITHUB_RETENTION_DAYS -e GITHUB_RUN_ATTEMPT -e GITHUB_ACTOR
-    // -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME
-    // -e GITHUB_SERVER_URL -e GITHUB_API_URL -e GITHUB_GRAPHQL_URL
-    // -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e GITHUB_ACTION_REPOSITORY
-    // -e GITHUB_ACTION_REF -e GITHUB_PATH -e GITHUB_ENV -e RUNNER_DEBUG
-    // -e RUNNER_OS -e RUNNER_NAME -e RUNNER_TOOL_CACHE
-    // -e RUNNER_TEMP -e RUNNER_WORKSPACE
-    //   eccdf520697a035599d6e8c8dc801f004fdd3797cdce88f590aba3669a88d9bc sh -e /__w/_temp/d3b30383-719c-4e76-a16f-8f85443352be.sh
-
-    const cpTempArgs = [
-      'cp',
-      '/actions-runner/_work/_temp',
-      'job-container:/__w/'
-    ]
-    await exec.exec('kubectl', cpTempArgs)
-
-    const execArgs = ['exec']
-    execArgs.push(execInput.jobContainer.containerId)
-    execArgs.push('-i')
-    execArgs.push('-t')
-    execArgs.push('--')
-    execArgs.push('/__runner_util/node')
-    execArgs.push('/__runner_util/kubeInnerHandler')
-
-    core.debug(JSON.stringify(execArgs))
-
-    await exec.exec('kubectl', execArgs, {
-      input: Buffer.from(JSON.stringify(execInput))
-    })
-  }
-}
-
-run()
--- a/src/Misc/containerEngineHandlers/kubectlHandler/tsconfig.json
+++ b/src/Misc/containerEngineHandlers/kubectlHandler/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"]
-}
--- a/src/Misc/containerEngineHandlers/podmanHandler/.eslintignore
+++ b/src/Misc/containerEngineHandlers/podmanHandler/.eslintignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/podmanHandler/.eslintrc.json
+++ b/src/Misc/containerEngineHandlers/podmanHandler/.eslintrc.json
@@ -1,59 +0,0 @@
-{
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/es6"],
-    "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/ban-ts-ignore": "error",
-      "camelcase": "off",
-      "@typescript-eslint/camelcase": "error",
-      "@typescript-eslint/class-name-casing": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"],
-      "@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-object-literal-type-assertion": "error",
-      "@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-interface": "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",
-      "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
-    }
-  }
--- a/src/Misc/containerEngineHandlers/podmanHandler/.prettierignore
+++ b/src/Misc/containerEngineHandlers/podmanHandler/.prettierignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/containerEngineHandlers/podmanHandler/.prettierrc.json
+++ b/src/Misc/containerEngineHandlers/podmanHandler/.prettierrc.json
@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
--- a/src/Misc/containerEngineHandlers/podmanHandler/README.md
+++ b/src/Misc/containerEngineHandlers/podmanHandler/README.md
@@ -1 +0,0 @@
-To update podmanHandler under `Misc/layoutbin` run `npm install && npm run all`
--- a/src/Misc/containerEngineHandlers/podmanHandler/package-lock.json
+++ b/src/Misc/containerEngineHandlers/podmanHandler/package-lock.json
--- a/src/Misc/containerEngineHandlers/podmanHandler/package.json
+++ b/src/Misc/containerEngineHandlers/podmanHandler/package.json
@@ -1,36 +0,0 @@
-{
-  "name": "podmanHandler",
-  "version": "1.0.0",
-  "description": "GitHub Actions",
-  "main": "lib/podmanHandler.js",
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write **/*.ts",
-    "format-check": "prettier --check **/*.ts",
-    "lint": "eslint src/**/*.ts",
-    "pack": "ncc build -o ../../layoutbin/podmanHandler",
-    "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/exec": "^1.1.0",
-    "@actions/core": "^1.6.0"
-  },
-  "devDependencies": {
-    "@types/node": "^12.7.12",
-    "@typescript-eslint/parser": "^2.8.0",
-    "@zeit/ncc": "^0.20.5",
-    "eslint": "^6.8.0",
-    "eslint-plugin-github": "^2.0.0",
-    "prettier": "^1.19.1",
-    "typescript": "^3.6.4"
-  }
-}
--- a/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
+++ b/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
@@ -1,150 +0,0 @@
-import * as exec from '@actions/exec'
-import * as core from '@actions/core'
-import * as events from 'events'
-import * as readline from 'readline'
-
-async function run(): Promise<void> {
-  let input = ''
-
-  const rl = readline.createInterface({
-    input: process.stdin
-  })
-
-  rl.on('line', line => {
-    core.debug(`Line from STDIN: ${line}`)
-    input = line
-  })
-
-  await events.once(rl, 'close')
-
-  core.debug(input)
-
-  const inputJson = JSON.parse(input)
-  core.debug(JSON.stringify(inputJson))
-
-  const command = inputJson.command
-  if (command === 'Create') {
-    const creationInput = inputJson.creationInput
-    core.debug(JSON.stringify(creationInput))
-    const containers = creationInput.containers
-    const jobContainer = containers[0]
-
-    const networkName = 'actions_podman_network'
-    // podman network create {network}  -> track and return `network` for ${{job.container.network}}
-    await exec.exec('podman', ['network', 'create', networkName])
-
-    const containerImage = `docker.io/library/${jobContainer.containerImage}`
-    // podman pull docker.io/library/{image}
-    await exec.exec('podman', ['pull', containerImage])
-
-    // podman create --name e088c842be1f46b394212618408aaba0_node1016jessie_6196c9
-    //      --label fa4e14
-    //      --workdir /__w/canary/canary
-    //      --network github_network_f98a6e1e96e74d919d814c165641cba3
-    //      -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true
-    //      -v "/var/run/docker.sock":"/var/run/docker.sock"
-    //      -v "/home/runner/work":"/__w"
-    //      -v "/home/runner/runners/2.283.2/externals":"/__e":ro
-    //      -v "/home/runner/work/_temp":"/__w/_temp"
-    //      -v "/home/runner/work/_actions":"/__w/_actions"
-    //      -v "/opt/hostedtoolcache":"/__t"
-    //      -v "/home/runner/work/_temp/_github_home":"/github/home"
-    //      -v "/home/runner/work/_temp/_github_workflow":"/github/workflow"
-    //      --entrypoint "tail" node:10.16-jessie "-f" "/dev/null"
-    const creatArgs = ['create']
-    creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`)
-    creatArgs.push(`--network=${networkName}`)
-
-    for (const mountVolume of jobContainer.mountVolumes) {
-      creatArgs.push(
-        `-v=${mountVolume.sourceVolumePath}:${mountVolume.targetVolumePath}`
-      )
-    }
-
-    creatArgs.push(`--entrypoint=tail`)
-    creatArgs.push(containerImage)
-    creatArgs.push(`-f`)
-    creatArgs.push(`/dev/null`)
-
-    core.debug(JSON.stringify(creatArgs))
-
-    // const containerId = await exec.getExecOutput('podman', [
-    //   'create',
-    //   // `--workdir ${jobContainer.containerWorkDirectory}`,
-    //   `--network=${networkName}`,
-    //   // `-v=/Users/ting/Desktop/runner/_layout/_work:/__w`,
-    //   `--entrypoint=${jobContainer.containerEntryPoint}`,
-    //   `${containerImage}`,
-    //   `${jobContainer.containerEntryPointArgs}`
-    // ])
-
-    const containerId = await exec.getExecOutput('podman', creatArgs)
-
-    core.debug(JSON.stringify(containerId))
-
-    // podman start {containerId}
-    await exec.exec('podman', ['start', containerId.stdout.trim()])
-
-    // get PATH inside the container
-
-    // output containerId for ${{job.container.id}}
-
-    const creationOutput = {
-      JobContainerId: containerId.stdout.trim(),
-      Network: networkName
-    }
-
-    const output = JSON.stringify({CreationOutput: creationOutput})
-    core.debug(output)
-
-    process.stderr.write(
-      `___CONTAINER_ENGINE_HANDLER_OUTPUT___${output}___CONTAINER_ENGINE_HANDLER_OUTPUT___`
-    )
-  } else if (command === 'Remove') {
-    const removeInput = inputJson.removeInput
-    core.debug(JSON.stringify(removeInput))
-    const jobContainerId = removeInput.jobContainerId
-    const network = removeInput.network
-
-    await exec.exec('podman', ['rm', '-f', jobContainerId])
-    await exec.exec('podman', ['network', 'rm', '-f', network])
-  } else if (command === 'Exec') {
-    const execInput = inputJson.execInput
-    core.debug(JSON.stringify(execInput))
-
-    // podman exec -i --workdir /__w/canary/canary
-    // -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY
-    // -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER
-    // -e GITHUB_RETENTION_DAYS -e GITHUB_RUN_ATTEMPT -e GITHUB_ACTOR
-    // -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME
-    // -e GITHUB_SERVER_URL -e GITHUB_API_URL -e GITHUB_GRAPHQL_URL
-    // -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e GITHUB_ACTION_REPOSITORY
-    // -e GITHUB_ACTION_REF -e GITHUB_PATH -e GITHUB_ENV -e RUNNER_DEBUG
-    // -e RUNNER_OS -e RUNNER_NAME -e RUNNER_TOOL_CACHE
-    // -e RUNNER_TEMP -e RUNNER_WORKSPACE
-    //   eccdf520697a035599d6e8c8dc801f004fdd3797cdce88f590aba3669a88d9bc sh -e /__w/_temp/d3b30383-719c-4e76-a16f-8f85443352be.sh
-
-    const execArgs = ['exec']
-    execArgs.push('-i')
-    execArgs.push(`--workdir=${execInput.workingDirectory}`)
-    for (const envKey of execInput.environmentKeys) {
-      execArgs.push(`-e=${envKey}`)
-    }
-    execArgs.push(execInput.jobContainer.containerId)
-    execArgs.push(execInput.fileName)
-
-    const args = (<string>execInput.arguments).split(' ')
-    core.debug(JSON.stringify(args))
-
-    execArgs.push(...args)
-
-    core.debug(JSON.stringify(execArgs))
-
-    await exec.exec('podman', execArgs)
-  }
-
-  await exec.exec('podman', ['network', 'ls'])
-  await exec.exec('podman', ['ps', '-a'])
-}
-
-run()
--- a/src/Misc/containerEngineHandlers/podmanHandler/tsconfig.json
+++ b/src/Misc/containerEngineHandlers/podmanHandler/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"]
-}
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -4,6 +4,7 @@ PRECACHE=$2

 NODE_URL=https://nodejs.org/dist
 NODE12_VERSION="12.13.1"
+NODE16_VERSION="16.13.0"

 get_abs_path() {
  # exploits the fact that pwd will print abs path when no args
@@ -126,6 +127,8 @@ function acquireExternalTool() {
 if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.exe" node12/bin
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.lib" node12/bin
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
    if [[ "$PRECACHE" != "" ]]; then
        acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
    fi
@@ -134,18 +137,23 @@ fi
 # Download the external tools only for OSX.
 if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-darwin-x64.tar.gz" node12 fix_nested_dir
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-darwin-x64.tar.gz" node16 fix_nested_dir
 fi

 # Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-x64.tar.gz" node12 fix_nested_dir
    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE12_VERSION}/alpine/x64/node-${NODE12_VERSION}-alpine-x64.tar.gz" node12_alpine
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-x64.tar.gz" node16 fix_nested_dir
+    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE16_VERSION}/alpine/x64/node-v${NODE16_VERSION}-alpine-x64.tar.gz" node16_alpine
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-arm64.tar.gz" node12 fix_nested_dir
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-arm64.tar.gz" node16 fix_nested_dir
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-armv7l.tar.gz" node12 fix_nested_dir
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-armv7l.tar.gz" node16 fix_nested_dir
 fi
--- a/src/Misc/layoutbin/kubeInnerHandler/index.js
+++ b/src/Misc/layoutbin/kubeInnerHandler/index.js
--- a/src/Misc/layoutbin/kubectlHandler/index.js
+++ b/src/Misc/layoutbin/kubectlHandler/index.js
--- a/src/Misc/layoutbin/podman-handler.js
+++ b/src/Misc/layoutbin/podman-handler.js
@@ -1,49 +0,0 @@
-// Job container creation
-
-// podman network create {network}  -> track and return `network` for ${{job.container.network}}
-
-// podman pull docker.io/library/{image}
-
-// podman create --name e088c842be1f46b394212618408aaba0_node1016jessie_6196c9 
-//      --label fa4e14 
-//      --workdir /__w/canary/canary 
-//      --network github_network_f98a6e1e96e74d919d814c165641cba3  
-//      -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true 
-//      -v "/var/run/docker.sock":"/var/run/docker.sock" 
-//      -v "/home/runner/work":"/__w" 
-//      -v "/home/runner/runners/2.283.2/externals":"/__e":ro 
-//      -v "/home/runner/work/_temp":"/__w/_temp" 
-//      -v "/home/runner/work/_actions":"/__w/_actions" 
-//      -v "/opt/hostedtoolcache":"/__t" 
-//      -v "/home/runner/work/_temp/_github_home":"/github/home" 
-//      -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" 
-//      --entrypoint "tail" node:10.16-jessie "-f" "/dev/null"
-
-// podman start {containerId}
-
-// get PATH inside the container
-
-// output containerId for ${{job.container.id}}
-
-
-
-// Job container stop
-
-// podman rm --force {containerId}
-
-// podman network rm {network}
-
-
-// Run step
-
-// podman exec -i --workdir /__w/canary/canary 
-// -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY 
-// -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER 
-// -e GITHUB_RETENTION_DAYS -e GITHUB_RUN_ATTEMPT -e GITHUB_ACTOR 
-// -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME 
-// -e GITHUB_SERVER_URL -e GITHUB_API_URL -e GITHUB_GRAPHQL_URL 
-// -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e GITHUB_ACTION_REPOSITORY 
-// -e GITHUB_ACTION_REF -e GITHUB_PATH -e GITHUB_ENV -e RUNNER_DEBUG 
-// -e RUNNER_OS -e RUNNER_NAME -e RUNNER_TOOL_CACHE 
-// -e RUNNER_TEMP -e RUNNER_WORKSPACE 
-//   eccdf520697a035599d6e8c8dc801f004fdd3797cdce88f590aba3669a88d9bc sh -e /__w/_temp/d3b30383-719c-4e76-a16f-8f85443352be.sh
--- a/src/Misc/layoutbin/podmanHandler/index.js
+++ b/src/Misc/layoutbin/podmanHandler/index.js
--- a/src/Misc/layoutbin/update.sh.template
+++ b/src/Misc/layoutbin/update.sh.template
@@ -161,59 +161,13 @@ if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner path. Path: $path, pgid: $procgroup, root: $rootfolder" >> "$telemetryfile" 2>&1
        fi
    else
+        runproc=$(ps x -o pgid,command | grep "run.sh" | grep -v grep | awk '{print $1}')
+        if [[ $? -eq 0 && -n "$runproc" ]]
+        then
+            date "+[%F %T-%4N] Running as ephemeral using run.sh, no need to recreate node folder" >> "$logfile" 2>&1
+        else
            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner pgid. pgid: $procgroup, root: $rootfolder" >> "$logfile" 2>&1
            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner pgid. pgid: $procgroup, root: $rootfolder" >> "$telemetryfile" 2>&1
-    fi
-
-    if [ $attemptedtargetedfix -eq 0 ]
-    then
-
-        date "+[%F %T-%4N] DarwinRunnerUpgrade: Defaulting to old macOS service fix" >> "$logfile" 2>&1
-        date "+[%F %T-%4N] DarwinRunnerUpgrade: Defaulting to old macOS service fix" >> "$telemetryfile" 2>&1
-        if [[ ! -e "$rootfolder/externals.2.280.3/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.280.3/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.280.3/node12/bin/node"
-        fi
-
-        if [[ ! -e "$rootfolder/externals.2.280.2/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.280.2/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.280.2/node12/bin/node"
-        fi
-
-        if [[ ! -e "$rootfolder/externals.2.280.1/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.280.1/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.280.1/node12/bin/node"
-        fi
-
-        # GHES 3.2
-        if [[ ! -e "$rootfolder/externals.2.279.0/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.279.0/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.279.0/node12/bin/node"
-        fi
-
-        # GHES 3.1.2 or later
-        if [[ ! -e "$rootfolder/externals.2.278.0/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.278.0/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.278.0/node12/bin/node"
-        fi
-
-        # GHES 3.1.0
-        if [[ ! -e "$rootfolder/externals.2.276.1/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.276.1/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.276.1/node12/bin/node"
-        fi
-
-        # GHES 3.0
-        if [[ ! -e "$rootfolder/externals.2.273.5/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.273.5/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.273.5/node12/bin/node"
        fi
    fi
 fi
--- a/src/Misc/layoutroot/entrypoint.sh
+++ b/src/Misc/layoutroot/entrypoint.sh
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-[ -n "${GITHUB_PAT:-""}" ] || fatal "GITHUB_PAT variable must be set"
-[ -n "${RUNNER_CONFIG_URL:-""}" ] || fatal "RUNNER_CONFIG_URL variable must be set"
-# [ -n "${RUNNER_NAME:-""}" ] || fatal "RUNNER_NAME variable must be set"
-
-# if [ -n "${RUNNER_NAME}" ]; then
-#     # Use container id to gen unique runner name if name not provide
-#     CONTAINER_ID=$(cat /proc/self/cgroup | head -n 1 | tr '/' '\n' | tail -1 | cut -c1-12)
-#     RUNNER_NAME="actions-runner-${CONTAINER_ID}"
-# fi
-
-# if the scope has a slash, it's a repo runner
-# orgs_or_repos="orgs"
-# if [[ "$GITHUB_RUNNER_SCOPE" == *\/* ]]; then
-#     orgs_or_repos="repos"
-# fi
-
-# RUNNER_REG_URL="${GITHUB_SERVER_URL:=https://github.com}/${GITHUB_RUNNER_SCOPE}"
-
-# echo "Runner Name      : ${RUNNER_NAME}"
-echo "Registration URL : ${RUNNER_CONFIG_URL}"
-# echo "GitHub API URL   : ${GITHUB_API_URL:=https://api.github.com}"
-# echo "Runner Labels    : ${RUNNER_LABELS:=""}"
-
-# TODO: if api url is not default, validate it ends in /api/v3
-
-# RUNNER_LABELS_ARG=""
-# if [ -n "${RUNNER_LABELS}" ]; then
-#     RUNNER_LABELS_ARG="--labels ${RUNNER_LABELS}"
-# fi
-
-# RUNNER_GROUP_ARG=""
-# if [ -n "${RUNNER_GROUP}" ]; then
-#     RUNNER_GROUP_ARG="--runnergroup ${RUNNER_GROUP}"
-# fi
-
-# if [ -n "${K8S_HOST_IP}" ]; then
-#     export http_proxy=http://$K8S_HOST_IP:9090
-# fi
-
-# curl -v -s -X POST ${GITHUB_API_URL}/${orgs_or_repos}/${GITHUB_RUNNER_SCOPE}/actions/runners/registration-token -H "authorization: token $GITHUB_PAT" -H "accept: application/vnd.github.everest-preview+json"
-
-# Generate registration token
-# RUNNER_REG_TOKEN=$(curl -s -X POST ${GITHUB_API_URL}/${orgs_or_repos}/${GITHUB_RUNNER_SCOPE}/actions/runners/registration-token -H "authorization: token $GITHUB_PAT" -H "accept: application/vnd.github.everest-preview+json" | jq -r '.token')
-
-# Create the runner and configure it
-./config.sh --unattended --url $RUNNER_CONFIG_URL --pat $GITHUB_PAT --replace --ephemeral
-
-# while (! docker version ); do
-#   # Docker takes a few seconds to initialize
-#   echo "Waiting for Docker to launch..."
-#   sleep 1
-# done
-
-# unset env
-unset RUNNER_CONFIG_URL
-unset GITHUB_PAT
-
-# Run it
-./run.sh
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -200,9 +200,17 @@ namespace GitHub.Runner.Common
                if (credData != null &&
                    credData.Data.TryGetValue("clientId", out var clientId))
                {
-                    _userAgents.Add(new ProductInfoHeaderValue($"RunnerId", clientId));
+                    _userAgents.Add(new ProductInfoHeaderValue("ClientId", clientId));
                }
            }
+
+            var runnerFile = GetConfigFile(WellKnownConfigFile.Runner);
+            if (File.Exists(runnerFile))
+            {
+                var runnerSettings = IOUtil.LoadObject<RunnerSettings>(runnerFile);
+                _userAgents.Add(new ProductInfoHeaderValue("RunnerId", runnerSettings.AgentId.ToString(CultureInfo.InvariantCulture)));
+                _userAgents.Add(new ProductInfoHeaderValue("GroupId", runnerSettings.PoolId.ToString(CultureInfo.InvariantCulture)));
+            }
        }

        public string GetDirectory(WellKnownDirectory directory)
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -38,7 +38,8 @@ namespace GitHub.Runner.Common
        public async Task ConnectAsync(VssConnection jobConnection)
        {
            _connection = jobConnection;
-            int attemptCount = 5;
+            int totalAttempts = 5;
+            int attemptCount = totalAttempts;
            var configurationStore = HostContext.GetService<IConfigurationStore>();
            var runnerSettings = configurationStore.GetSettings();
 
@@ -56,18 +57,21 @@ namespace GitHub.Runner.Common

                    if (runnerSettings.IsHostedServer)
                    {
-                        await CheckNetworkEndpointsAsync();
+                        await CheckNetworkEndpointsAsync(attemptCount);
                    }
                }

-                await Task.Delay(100);
+                int attempt = totalAttempts - attemptCount;
+                TimeSpan backoff = BackoffTimerHelper.GetExponentialBackoff(attempt, TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(3.2), TimeSpan.FromMilliseconds(100));
+
+                await Task.Delay(backoff);
            }

            _taskClient = _connection.GetClient<TaskHttpClient>();
            _hasConnection = true;
        }

-        private async Task CheckNetworkEndpointsAsync()
+        private async Task CheckNetworkEndpointsAsync(int attemptsLeft)
        {
            try
            {
@@ -79,8 +83,8 @@ namespace GitHub.Runner.Common

                    actionsClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);

-                    // Call the _apis/health endpoint
-                    var response = await actionsClient.GetAsync(new Uri(baseUri, "_apis/health"));
+                    // Call the _apis/health endpoint, and include how many attempts are left as a URL query for easy tracking
+                    var response = await actionsClient.GetAsync(new Uri(baseUri, $"_apis/health?_internalRunnerAttemptsLeft={attemptsLeft}"));
                    Trace.Info($"Actions health status code: {response.StatusCode}");
                }
            }
@@ -100,8 +104,8 @@ namespace GitHub.Runner.Common
                {
                    gitHubClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);

-                    // Call the api.github.com endpoint
-                    var response = await gitHubClient.GetAsync("https://api.github.com");
+                    // Call the api.github.com endpoint, and include how many attempts are left as a URL query for easy tracking
+                    var response = await gitHubClient.GetAsync($"https://api.github.com?_internalRunnerAttemptsLeft={attemptsLeft}");
                    Trace.Info($"api.github.com status code: {response.StatusCode}");
                }
            }
--- a/src/Runner.Common/Runner.Common.csproj
+++ b/src/Runner.Common/Runner.Common.csproj
@@ -5,7 +5,6 @@
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Common/RunnerServer.cs
+++ b/src/Runner.Common/RunnerServer.cs
@@ -51,7 +51,7 @@ namespace GitHub.Runner.Common
        Task<PackageMetadata> GetPackageAsync(string packageType, string platform, string version, bool includeToken, CancellationToken cancellationToken);

        // agent update
-        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState);
+        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace);
    }

    public sealed class RunnerServer : RunnerService, IRunnerServer
@@ -341,25 +341,10 @@ namespace GitHub.Runner.Common
            return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, includeToken, cancellationToken: cancellationToken);
        }

-        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState)
+        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace)
        {
            CheckConnection(RunnerConnectionType.Generic);
-            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState);
-        }
-
-        //-----------------------------------------------------------------
-        // Runner Auth Url
-        //-----------------------------------------------------------------
-        public Task<string> GetRunnerAuthUrlAsync(int runnerPoolId, int runnerId)
-        {
-            CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.GetAgentAuthUrlAsync(runnerPoolId, runnerId);
-        }
-
-        public Task ReportRunnerAuthUrlErrorAsync(int runnerPoolId, int runnerId, string error)
-        {
-            CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.ReportAgentAuthUrlMigrationErrorAsync(runnerPoolId, runnerId, error);
+            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace);
        }
    }
 }
--- a/src/Runner.Listener/Runner.Listener.csproj
+++ b/src/Runner.Listener/Runner.Listener.csproj
@@ -5,7 +5,6 @@
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -312,6 +312,8 @@ namespace GitHub.Runner.Listener
                }

                HostContext.WritePerfCounter("SessionCreated");
+
+                _term.WriteLine($"Current runner version: '{BuildConstants.RunnerPackage.Version}'");
                _term.WriteLine($"{DateTime.UtcNow:u}: Listening for Jobs");

                IJobDispatcher jobDispatcher = null;
--- a/src/Runner.Listener/SelfUpdater.cs
+++ b/src/Runner.Listener/SelfUpdater.cs
@@ -13,6 +13,7 @@ using GitHub.Services.WebApi;
 using GitHub.Services.Common;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
+using System.Text;

 namespace GitHub.Runner.Listener
 {
@@ -63,25 +64,25 @@ namespace GitHub.Runner.Listener

                // Print console line that warn user not shutdown runner.
                await UpdateRunnerUpdateStateAsync("Runner update in progress, do not shutdown runner.");
-                await UpdateRunnerUpdateStateAsync($"Downloading {_targetPackage.Version} runner");
+                await UpdateRunnerUpdateStateAsync($"Downloading {_targetPackage.Version} runner", $"RunnerPlatform: {_targetPackage.Platform}");

-                await DownloadLatestRunner(token);
+                var downloadTrace = await DownloadLatestRunner(token);
                Trace.Info($"Download latest runner and unzip into runner root.");

                // wait till all running job finish
-                await UpdateRunnerUpdateStateAsync("Waiting for current job finish running.");
+                await UpdateRunnerUpdateStateAsync("Waiting for current job finish running.", downloadTrace);

                await jobDispatcher.WaitAsync(token);
                Trace.Info($"All running job has exited.");

                // We need to keep runner backup around for macOS until we fixed https://github.com/actions/runner/issues/743
-#if !OS_OSX
                // delete runner backup
+                var stopWatch = Stopwatch.StartNew();
                DeletePreviousVersionRunnerBackup(token);
                Trace.Info($"Delete old version runner backup.");
-#endif
+                stopWatch.Stop();
                // generate update script from template
-                await UpdateRunnerUpdateStateAsync("Generate and execute update script.");
+                await UpdateRunnerUpdateStateAsync("Generate and execute update script.", $"DeleteRunnerBackupTime: {stopWatch.ElapsedMilliseconds}ms");

                string updateScript = GenerateUpdateScript(restartInteractiveRunner);
                Trace.Info($"Generate update script into: {updateScript}");
@@ -98,7 +99,7 @@ namespace GitHub.Runner.Listener
                invokeScript.Start();
                Trace.Info($"Update script start running");

-                await UpdateRunnerUpdateStateAsync("Runner will exit shortly for update, should be back online within 10 seconds.");
+                await UpdateRunnerUpdateStateAsync("Runner will exit shortly for update, should be back online within 10 seconds.", $"RestartInteractiveRunner: {restartInteractiveRunner}");

                return true;
            }
@@ -152,8 +153,10 @@ namespace GitHub.Runner.Listener
        /// </summary>
        /// <param name="token"></param>
        /// <returns></returns>
-        private async Task DownloadLatestRunner(CancellationToken token)
+        private async Task<string> DownloadLatestRunner(CancellationToken token)
        {
+            var traceStringBuilder = new StringBuilder();
+            traceStringBuilder.AppendLine($"DownloadUrl: {_targetPackage.DownloadUrl}");
            string latestRunnerDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), Constants.Path.UpdateDirectory);
            IOUtil.DeleteDirectory(latestRunnerDirectory, token);
            Directory.CreateDirectory(latestRunnerDirectory);
@@ -162,6 +165,7 @@ namespace GitHub.Runner.Listener
            string archiveFile = null;
            bool downloadSucceeded = false;

+            var stopWatch = Stopwatch.StartNew();
            try
            {
                // Download the runner, using multiple attempts in order to be resilient against any networking/CDN issues
@@ -212,6 +216,7 @@ namespace GitHub.Runner.Listener
                        try
                        {
                            Trace.Info($"Download runner: begin download");
+                            long downloadSize = 0;

                            //open zip stream in async mode
                            using (HttpClient httpClient = new HttpClient(HostContext.CreateHttpClientHandler()))
@@ -230,11 +235,16 @@ namespace GitHub.Runner.Listener
                                    //81920 is the default used by System.IO.Stream.CopyTo and is under the large object heap threshold (85k).
                                    await result.CopyToAsync(fs, 81920, downloadCts.Token);
                                    await fs.FlushAsync(downloadCts.Token);
+                                    downloadSize = fs.Length;
                                }
                            }

                            Trace.Info($"Download runner: finished download");
                            downloadSucceeded = true;
+                            stopWatch.Stop();
+                            traceStringBuilder.AppendLine($"PackageDownloadTime: {stopWatch.ElapsedMilliseconds}ms");
+                            traceStringBuilder.AppendLine($"Attempts: {attempt}");
+                            traceStringBuilder.AppendLine($"PackageSize: {downloadSize / 1024 / 1024}MB");
                            break;
                        }
                        catch (OperationCanceledException) when (token.IsCancellationRequested)
@@ -259,6 +269,7 @@ namespace GitHub.Runner.Listener
                    throw new TaskCanceledException($"Runner package '{archiveFile}' failed after {Constants.RunnerDownloadRetryMaxAttempts} download attempts");
                }

+                stopWatch.Restart();
                // If we got this far, we know that we've successfully downloaded the runner package
                // Validate Hash Matches if it is provided
                using (FileStream stream = File.OpenRead(archiveFile))
@@ -322,7 +333,9 @@ namespace GitHub.Runner.Listener
                    throw new NotSupportedException($"{archiveFile}");
                }

+                stopWatch.Stop();
                Trace.Info($"Finished getting latest runner package at: {latestRunnerDirectory}.");
+                traceStringBuilder.AppendLine($"PackageExtractTime: {stopWatch.ElapsedMilliseconds}ms");
            }
            finally
            {
@@ -342,6 +355,7 @@ namespace GitHub.Runner.Listener
                }
            }

+            stopWatch.Restart();
            // copy latest runner into runner root folder
            // copy bin from _work/_update -> bin.version under root
            string binVersionDir = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"{Constants.Path.BinDirectory}.{_targetPackage.Version}");
@@ -367,6 +381,11 @@ namespace GitHub.Runner.Listener
                IOUtil.DeleteFile(destination);
                file.CopyTo(destination, true);
            }
+
+            stopWatch.Stop();
+            traceStringBuilder.AppendLine($"CopyRunnerToRootTime: {stopWatch.ElapsedMilliseconds}ms");
+
+            return traceStringBuilder.ToString();
        }

        private void DeletePreviousVersionRunnerBackup(CancellationToken token)
@@ -486,13 +505,18 @@ namespace GitHub.Runner.Listener
            return updateScript;
        }

-        private async Task UpdateRunnerUpdateStateAsync(string currentState)
+        private async Task UpdateRunnerUpdateStateAsync(string currentState, string trace = "")
        {
            _terminal.WriteLine(currentState);

+            if (!string.IsNullOrEmpty(trace))
+            {
+                Trace.Info(trace);
+            }
+
            try
            {
-                await _runnerServer.UpdateAgentUpdateStateAsync(_poolId, _agentId, currentState);
+                await _runnerServer.UpdateAgentUpdateStateAsync(_poolId, _agentId, currentState, trace);
            }
            catch (VssResourceNotFoundException)
            {
--- a/src/Runner.PluginHost/Runner.PluginHost.csproj
+++ b/src/Runner.PluginHost/Runner.PluginHost.csproj
@@ -5,7 +5,6 @@
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Plugins/Runner.Plugins.csproj
+++ b/src/Runner.Plugins/Runner.Plugins.csproj
@@ -5,7 +5,6 @@
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Sdk/ProcessInvoker.cs
+++ b/src/Runner.Sdk/ProcessInvoker.cs
@@ -264,7 +264,17 @@ namespace GitHub.Runner.Sdk
            {
                foreach (KeyValuePair<string, string> kvp in environment)
                {
+#if OS_WINDOWS
+                    string tempKey = String.IsNullOrWhiteSpace(kvp.Key) ? kvp.Key : kvp.Key.Split('\0')[0];
+                    string tempValue = String.IsNullOrWhiteSpace(kvp.Value) ? kvp.Value : kvp.Value.Split('\0')[0];
+                    if(!String.IsNullOrWhiteSpace(tempKey))
+                    {
+                         _proc.StartInfo.Environment[tempKey] = tempValue;
+                    }
+#else
                    _proc.StartInfo.Environment[kvp.Key] = kvp.Value;
+
+#endif
                }
            }

--- a/src/Runner.Sdk/Runner.Sdk.csproj
+++ b/src/Runner.Sdk/Runner.Sdk.csproj
@@ -5,7 +5,6 @@
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Worker/ActionManager.cs
+++ b/src/Runner.Worker/ActionManager.cs
@@ -267,6 +267,19 @@ namespace GitHub.Runner.Worker
                            _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction);
                        }
                    }
+                    else if (depth > 0)
+                    {
+                        // if we're in a composite action and haven't loaded the local action yet
+                        // we assume it has a post step
+                        if (!_cachedEmbeddedPostSteps.ContainsKey(parentStepId))
+                        {
+                            // If we haven't done so already, add the parent to the post steps
+                            _cachedEmbeddedPostSteps[parentStepId] = new Stack<Pipelines.ActionStep>();
+                        }
+                        // Clone action so we can modify the condition without affecting the original
+                        var clonedAction = action.Clone() as Pipelines.ActionStep;
+                        _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction);
+                    }
                }
            }

@@ -430,7 +443,7 @@ namespace GitHub.Runner.Worker
                        {
                            for (var i = 0; i < compositeAction.Steps.Count; i++)
                            {
-                                // Store Id's for later load actions
+                                // Load stored Ids for later load actions
                                compositeAction.Steps[i].Id = _cachedEmbeddedStepIds[action.Id][i];
                                if (string.IsNullOrEmpty(executionContext.Global.Variables.Get("DistributedTask.EnableCompositeActions")) && compositeAction.Steps[i].Reference.Type != Pipelines.ActionSourceType.Script)
                                {
@@ -438,6 +451,16 @@ namespace GitHub.Runner.Worker
                                }
                            }
                        }
+                        else
+                        {
+                            _cachedEmbeddedStepIds[action.Id] = new List<Guid>();
+                            foreach (var compositeStep in compositeAction.Steps)
+                            {
+                                var guid = Guid.NewGuid();
+                                compositeStep.Id = guid;
+                                _cachedEmbeddedStepIds[action.Id].Add(guid);
+                            }
+                        }
                    }
                    else
                    {
@@ -1034,7 +1057,6 @@ namespace GitHub.Runner.Worker
                        }
                    }

-                    // TODO: remove once we remove the DistributedTask.EnableCompositeActions FF
                    foreach (var step in compositeAction.Steps)
                    {
                        if (string.IsNullOrEmpty(executionContext.Global.Variables.Get("DistributedTask.EnableCompositeActions")) && step.Reference.Type != Pipelines.ActionSourceType.Script)
@@ -1177,6 +1199,8 @@ namespace GitHub.Runner.Worker
        public string Pre { get; set; }

        public string Post { get; set; }
+
+        public string NodeVersion { get; set; }
    }

    public sealed class PluginActionExecutionData : ActionExecutionData
--- a/src/Runner.Worker/ActionManifestManager.cs
+++ b/src/Runner.Worker/ActionManifestManager.cs
@@ -451,7 +451,8 @@ namespace GitHub.Runner.Worker
                        };
                    }
                }
-                else if (string.Equals(usingToken.Value, "node12", StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(usingToken.Value, "node12", StringComparison.OrdinalIgnoreCase)||
+                         string.Equals(usingToken.Value, "node16", StringComparison.OrdinalIgnoreCase))
                {
                    if (string.IsNullOrEmpty(mainToken?.Value))
                    {
@@ -461,6 +462,7 @@ namespace GitHub.Runner.Worker
                    {
                        return new NodeJSActionExecutionData()
                        {
+                            NodeVersion = usingToken.Value,
                            Script = mainToken.Value,
                            Pre = preToken?.Value,
                            InitCondition = preIfToken?.Value ?? "always()",
@@ -490,7 +492,7 @@ namespace GitHub.Runner.Worker
                }
                else
                {
-                    throw new ArgumentOutOfRangeException($"'using: {usingToken.Value}' is not supported, use 'docker' or 'node12' instead.");
+                    throw new ArgumentOutOfRangeException($"'using: {usingToken.Value}' is not supported, use 'docker', 'node12' or 'node16' instead.");
                }
            }
            else if (pluginToken != null)
--- a/src/Runner.Worker/Container/ContainerInfo.cs
+++ b/src/Runner.Worker/Container/ContainerInfo.cs
@@ -54,7 +54,7 @@ namespace GitHub.Runner.Worker.Container
            _pathMappings.Add(new PathMapping(hostContext.GetDirectory(WellKnownDirectory.Externals), "/__e"));
            if (this.IsJobContainer)
            {
-                // this.MountVolumes.Add(new MountVolume("/var/run/docker.sock", "/var/run/docker.sock"));
+                this.MountVolumes.Add(new MountVolume("/var/run/docker.sock", "/var/run/docker.sock"));
            }
 #endif
            if (container.Ports?.Count > 0)
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -131,11 +131,11 @@ namespace GitHub.Runner.Worker.Container
            {
                if (String.IsNullOrEmpty(env.Value))
                {
-                    dockerOptions.Add($"-e \"{env.Key}\"");
+                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
                }
                else
                {
-                    dockerOptions.Add($"-e \"{env.Key}={env.Value.Replace("\"", "\\\"")}\"");
+                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key, env.Value));
                }
            }

@@ -202,7 +202,7 @@ namespace GitHub.Runner.Worker.Container
            {
                // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
                // the value directly in the command
-                dockerOptions.Add($"-e {env.Key}");
+                dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
            }

            // Watermark for GitHub Action environment
--- a/src/Runner.Worker/Container/DockerUtil.cs
+++ b/src/Runner.Worker/Container/DockerUtil.cs
@@ -6,6 +6,9 @@ namespace GitHub.Runner.Worker.Container
 {
    public class DockerUtil
    {
+        private static readonly Regex QuoteEscape = new Regex(@"(\\*)" + "\"", RegexOptions.Compiled);
+        private static readonly Regex EndOfStringEscape = new Regex(@"(\\+)$", RegexOptions.Compiled);
+
        public static List<PortMapping> ParseDockerPort(IList<string> portMappingLines)
        {
            const string targetPort = "targetPort";
@@ -17,7 +20,7 @@ namespace GitHub.Runner.Worker.Container
            string pattern = $"^(?<{targetPort}>\\d+)/(?<{proto}>\\w+) -> (?<{host}>.+):(?<{hostPort}>\\d+)$";

            List<PortMapping> portMappings = new List<PortMapping>();
-            foreach(var line in portMappingLines)
+            foreach (var line in portMappingLines)
            {
                Match m = Regex.Match(line, pattern, RegexOptions.None, TimeSpan.FromSeconds(1));
                if (m.Success)
@@ -61,5 +64,44 @@ namespace GitHub.Runner.Worker.Container
            }
            return "";
        }
+
+        public static string CreateEscapedOption(string flag, string key)
+        {
+            if (String.IsNullOrEmpty(key))
+            {
+                return "";
+            }
+            return $"{flag} {EscapeString(key)}";
+        }
+
+        public static string CreateEscapedOption(string flag, string key, string value)
+        {
+            if (String.IsNullOrEmpty(key))
+            {
+                return "";
+            }
+            var escapedString = EscapeString($"{key}={value}");
+            return $"{flag} {escapedString}";
+        }
+
+        private static string EscapeString(string value)
+        {
+            if (String.IsNullOrEmpty(value))
+            {
+                return "";
+            }
+            // Dotnet escaping rules are weird here, we can only escape \ if it precedes a "
+            // If a double quotation mark follows two or an even number of backslashes, each proceeding backslash pair is replaced with one backslash and the double quotation mark is removed.
+            // If a double quotation mark follows an odd number of backslashes, including just one, each preceding pair is replaced with one backslash and the remaining backslash is removed; however, in this case the double quotation mark is not removed.
+            // https://docs.microsoft.com/en-us/dotnet/api/system.environment.getcommandlineargs?redirectedfrom=MSDN&view=net-6.0#remarks
+
+            // First, find any \ followed by a " and double the number of \ + 1.
+             value = QuoteEscape.Replace(value, @"$1$1\" + "\"");
+            // Next, what if it ends in `\`, it would escape the end quote. So, we need to detect that at the end of the string and perform the same escape
+            // Luckily, we can just use the $ character with detects the end of string in regex
+            value = EndOfStringEscape.Replace(value, @"$1$1");
+            // Finally, wrap it in quotes
+            return $"\"{value}\"";
+        }
    }
 }
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -12,88 +12,9 @@ using GitHub.Runner.Sdk;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using Microsoft.Win32;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-using System.Threading.Channels;
-using GitHub.Services.WebApi;
-using System.Text;
-using System.Runtime.Serialization;

 namespace GitHub.Runner.Worker
 {
-    [DataContract]
-    public class ContainerEngineHandlerInput
-    {
-        [DataMember]
-        public string Command { get; set; }
-
-        [DataMember]
-        public ContainersCreationInput CreationInput { get; set; }
-
-        [DataMember]
-        public JobContainerExecInput ExecInput { get; set; }
-
-        [DataMember]
-        public ContainersRemoveInput RemoveInput { get; set; }
-    }
-
-    [DataContract]
-    public class ContainersCreationInput
-    {
-        [DataMember]
-        public List<ContainerInfo> Containers { get; set; }
-    }
-
-    [DataContract]
-    public class JobContainerExecInput
-    {
-        [DataMember]
-        public ContainerInfo JobContainer { get; set; }
-
-        [DataMember]
-        public string WorkingDirectory { get; set; }
-
-
-        [DataMember]
-        public string FileName { get; set; }
-
-
-        [DataMember]
-        public string Arguments { get; set; }
-
-
-        [DataMember]
-        public List<string> EnvironmentKeys { get; set; }
-
-        [DataMember]
-        public Dictionary<string, string> EnvironmentVariables { get; set; }
-    }
-
-
-
-    [DataContract]
-    public class ContainersRemoveInput
-    {
-        [DataMember]
-        public string Network { get; set; }
-        [DataMember]
-        public string JobContainerId { get; set; }
-    }
-
-    [DataContract]
-    public class ContainersCreationOutput
-    {
-        [DataMember]
-        public string Network { get; set; }
-        [DataMember]
-        public string JobContainerId { get; set; }
-    }
-
-    [DataContract]
-    public class ContainerEngineHandlerOutput
-    {
-        [DataMember]
-        public ContainersCreationOutput CreationOutput { get; set; }
-    }
-
    [ServiceLocator(Default = typeof(ContainerOperationProvider))]
    public interface IContainerOperationProvider : IRunnerService
    {
@@ -103,57 +24,25 @@ namespace GitHub.Runner.Worker

    public class ContainerOperationProvider : RunnerService, IContainerOperationProvider
    {
-        private IDockerCommandManager _dockerManager = null;
+        private IDockerCommandManager _dockerManager;

        public override void Initialize(IHostContext hostContext)
        {
            base.Initialize(hostContext);
-            // _dockerManager = HostContext.GetService<IDockerCommandManager>();
+            _dockerManager = HostContext.GetService<IDockerCommandManager>();
        }

        public async Task StartContainersAsync(IExecutionContext executionContext, object data)
        {
            Trace.Entering();
-            // if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            // {
-            //     throw new NotSupportedException("Container operations are only supported on Linux runners");
-            // }
+            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
+            {
+                throw new NotSupportedException("Container operations are only supported on Linux runners");
+            }
            ArgUtil.NotNull(executionContext, nameof(executionContext));
            List<ContainerInfo> containers = data as List<ContainerInfo>;
            ArgUtil.NotNull(containers, nameof(containers));

-            foreach (var container in containers)
-            {
-                if (container.IsJobContainer)
-                {
-                    // Configure job container - Mount workspace and tools, set up environment, and start long running process
-                    var githubContext = executionContext.ExpressionValues["github"] as GitHubContext;
-                    ArgUtil.NotNull(githubContext, nameof(githubContext));
-                    var workingDirectory = githubContext["workspace"] as StringContextData;
-                    ArgUtil.NotNullOrEmpty(workingDirectory, nameof(workingDirectory));
-                    container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Work), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Work))));
-                    container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Externals), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Externals)), true));
-                    container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Temp), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Temp))));
-                    // container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Actions), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Actions))));
-                    container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Tools), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Tools))));
-
-                    var tempHomeDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Temp), "_github_home");
-                    Directory.CreateDirectory(tempHomeDirectory);
-                    container.MountVolumes.Add(new MountVolume(tempHomeDirectory, "/github/home"));
-                    container.AddPathTranslateMapping(tempHomeDirectory, "/github/home");
-                    container.ContainerEnvironmentVariables["HOME"] = container.TranslateToContainerPath(tempHomeDirectory);
-
-                    var tempWorkflowDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Temp), "_github_workflow");
-                    Directory.CreateDirectory(tempWorkflowDirectory);
-                    container.MountVolumes.Add(new MountVolume(tempWorkflowDirectory, "/github/workflow"));
-                    container.AddPathTranslateMapping(tempWorkflowDirectory, "/github/workflow");
-
-                    container.ContainerWorkDirectory = container.TranslateToContainerPath(workingDirectory);
-                    container.ContainerEntryPoint = "tail";
-                    container.ContainerEntryPointArgs = "-f /dev/null";
-                }
-            }
-
            var postJobStep = new JobExtensionRunner(runAsync: this.StopContainersAsync,
                                                condition: $"{PipelineTemplateConstants.Always}()",
                                                displayName: "Stop containers",
@@ -162,71 +51,9 @@ namespace GitHub.Runner.Worker
            executionContext.Debug($"Register post job cleanup for stopping/deleting containers.");
            executionContext.RegisterPostJobStep(postJobStep);

-            var podManHandler = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), "kubectlHandler", "index.js");
-            if (File.Exists(podManHandler))
-            {
-                var podmanInput = new ContainerEngineHandlerInput()
-                {
-                    Command = "Create",
-                    CreationInput = new ContainersCreationInput()
-                    {
-                        Containers = containers
-                    }
-                };
-
-                ContainerEngineHandlerOutput podmanOutput = null;
-                using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
-                {
-                    var redirectStandardIn = Channel.CreateUnbounded<string>(new UnboundedChannelOptions() { SingleReader = true, SingleWriter = true });
-                    redirectStandardIn.Writer.TryWrite(JsonUtility.ToString(podmanInput));
-
-                    processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    {
-                        executionContext.Output(message.Data);
-                    };
-
-                    processInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    {
-                        executionContext.Output(message.Data);
-                        if (podmanOutput == null && message.Data.IndexOf("___CONTAINER_ENGINE_HANDLER_OUTPUT___") >= 0)
-                        {
-                            try
-                            {
-                                podmanOutput = JsonUtility.FromString<ContainerEngineHandlerOutput>(message.Data.Replace("___CONTAINER_ENGINE_HANDLER_OUTPUT___", ""));
-                            }
-                            catch (Exception ex)
-                            {
-                                executionContext.Error(ex);
-                            }
-                        }
-                    };
-
-                    // Execute the process. Exit code 0 should always be returned.
-                    // A non-zero exit code indicates infrastructural failure.
-                    // Task failure should be communicated over STDOUT using ## commands.
-                    await processInvoker.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Bin),
-                                                      fileName: Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), "node12", "bin", $"node{IOUtil.ExeExtension}"),
-                                                      arguments: podManHandler,
-                                                      environment: null,
-                                                      requireExitCodeZero: false,
-                                                      outputEncoding: Encoding.UTF8,
-                                                      killProcessOnCancel: false,
-                                                      redirectStandardIn: redirectStandardIn,
-                                                      cancellationToken: executionContext.CancellationToken);
-                }
-
-                if (podmanOutput != null)
-                {
-                    executionContext.JobContext.Container["network"] = new StringContextData(podmanOutput.CreationOutput.Network);
-                    executionContext.JobContext.Container["id"] = new StringContextData(podmanOutput.CreationOutput.JobContainerId);
-                    executionContext.Global.Container.ContainerId = podmanOutput.CreationOutput.JobContainerId;
-                }
-            }
-            else
-            {
-                // Check whether we are inside a container.
-                // Our container feature requires to map working directory from host to the container.
-                // If we are already inside a container, we will not able to find out the real working direcotry path on the host.
+            // Check whether we are inside a container.
+            // Our container feature requires to map working directory from host to the container.
+            // If we are already inside a container, we will not able to find out the real working direcotry path on the host.
 #if OS_WINDOWS
            // service CExecSvc is Container Execution Agent.
            ServiceController[] scServices = ServiceController.GetServices();
@@ -235,11 +62,11 @@ namespace GitHub.Runner.Worker
                throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
            }
 #else
-                var initProcessCgroup = File.ReadLines("/proc/1/cgroup");
-                if (initProcessCgroup.Any(x => x.IndexOf(":/docker/", StringComparison.OrdinalIgnoreCase) >= 0))
-                {
-                    throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
-                }
+            var initProcessCgroup = File.ReadLines("/proc/1/cgroup");
+            if (initProcessCgroup.Any(x => x.IndexOf(":/docker/", StringComparison.OrdinalIgnoreCase) >= 0))
+            {
+                throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
+            }
 #endif

 #if OS_WINDOWS
@@ -263,69 +90,68 @@ namespace GitHub.Runner.Worker
            }
 #endif

-                // Check docker client/server version
-                executionContext.Output("##[group]Checking docker version");
-                DockerVersion dockerVersion = await _dockerManager.DockerVersion(executionContext);
-                executionContext.Output("##[endgroup]");
+            // Check docker client/server version
+            executionContext.Output("##[group]Checking docker version");
+            DockerVersion dockerVersion = await _dockerManager.DockerVersion(executionContext);
+            executionContext.Output("##[endgroup]");

-                ArgUtil.NotNull(dockerVersion.ServerVersion, nameof(dockerVersion.ServerVersion));
-                ArgUtil.NotNull(dockerVersion.ClientVersion, nameof(dockerVersion.ClientVersion));
+            ArgUtil.NotNull(dockerVersion.ServerVersion, nameof(dockerVersion.ServerVersion));
+            ArgUtil.NotNull(dockerVersion.ClientVersion, nameof(dockerVersion.ClientVersion));

 #if OS_WINDOWS
            Version requiredDockerEngineAPIVersion = new Version(1, 30);  // Docker-EE version 17.6
 #else
-                Version requiredDockerEngineAPIVersion = new Version(1, 35); // Docker-CE version 17.12
+            Version requiredDockerEngineAPIVersion = new Version(1, 35); // Docker-CE version 17.12
 #endif

-                if (dockerVersion.ServerVersion < requiredDockerEngineAPIVersion)
-                {
-                    throw new NotSupportedException($"Min required docker engine API server version is '{requiredDockerEngineAPIVersion}', your docker ('{_dockerManager.DockerPath}') server version is '{dockerVersion.ServerVersion}'");
-                }
-                if (dockerVersion.ClientVersion < requiredDockerEngineAPIVersion)
-                {
-                    throw new NotSupportedException($"Min required docker engine API client version is '{requiredDockerEngineAPIVersion}', your docker ('{_dockerManager.DockerPath}') client version is '{dockerVersion.ClientVersion}'");
-                }
-
-                // Clean up containers left by previous runs
-                executionContext.Output("##[group]Clean up resources from previous jobs");
-                var staleContainers = await _dockerManager.DockerPS(executionContext, $"--all --quiet --no-trunc --filter \"label={_dockerManager.DockerInstanceLabel}\"");
-                foreach (var staleContainer in staleContainers)
-                {
-                    int containerRemoveExitCode = await _dockerManager.DockerRemove(executionContext, staleContainer);
-                    if (containerRemoveExitCode != 0)
-                    {
-                        executionContext.Warning($"Delete stale containers failed, docker rm fail with exit code {containerRemoveExitCode} for container {staleContainer}");
-                    }
-                }
-
-                int networkPruneExitCode = await _dockerManager.DockerNetworkPrune(executionContext);
-                if (networkPruneExitCode != 0)
-                {
-                    executionContext.Warning($"Delete stale container networks failed, docker network prune fail with exit code {networkPruneExitCode}");
-                }
-                executionContext.Output("##[endgroup]");
-
-                // Create local docker network for this job to avoid port conflict when multiple runners run on same machine.
-                // All containers within a job join the same network
-                executionContext.Output("##[group]Create local container network");
-                var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}";
-                await CreateContainerNetworkAsync(executionContext, containerNetwork);
-                executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
-                executionContext.Output("##[endgroup]");
-
-                foreach (var container in containers)
-                {
-                    container.ContainerNetwork = containerNetwork;
-                    await StartContainerAsync(executionContext, container);
-                }
-
-                executionContext.Output("##[group]Waiting for all services to be ready");
-                foreach (var container in containers.Where(c => !c.IsJobContainer))
-                {
-                    await ContainerHealthcheck(executionContext, container);
-                }
-                executionContext.Output("##[endgroup]");
+            if (dockerVersion.ServerVersion < requiredDockerEngineAPIVersion)
+            {
+                throw new NotSupportedException($"Min required docker engine API server version is '{requiredDockerEngineAPIVersion}', your docker ('{_dockerManager.DockerPath}') server version is '{dockerVersion.ServerVersion}'");
            }
+            if (dockerVersion.ClientVersion < requiredDockerEngineAPIVersion)
+            {
+                throw new NotSupportedException($"Min required docker engine API client version is '{requiredDockerEngineAPIVersion}', your docker ('{_dockerManager.DockerPath}') client version is '{dockerVersion.ClientVersion}'");
+            }
+
+            // Clean up containers left by previous runs
+            executionContext.Output("##[group]Clean up resources from previous jobs");
+            var staleContainers = await _dockerManager.DockerPS(executionContext, $"--all --quiet --no-trunc --filter \"label={_dockerManager.DockerInstanceLabel}\"");
+            foreach (var staleContainer in staleContainers)
+            {
+                int containerRemoveExitCode = await _dockerManager.DockerRemove(executionContext, staleContainer);
+                if (containerRemoveExitCode != 0)
+                {
+                    executionContext.Warning($"Delete stale containers failed, docker rm fail with exit code {containerRemoveExitCode} for container {staleContainer}");
+                }
+            }
+
+            int networkPruneExitCode = await _dockerManager.DockerNetworkPrune(executionContext);
+            if (networkPruneExitCode != 0)
+            {
+                executionContext.Warning($"Delete stale container networks failed, docker network prune fail with exit code {networkPruneExitCode}");
+            }
+            executionContext.Output("##[endgroup]");
+
+            // Create local docker network for this job to avoid port conflict when multiple runners run on same machine.
+            // All containers within a job join the same network
+            executionContext.Output("##[group]Create local container network");
+            var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}";
+            await CreateContainerNetworkAsync(executionContext, containerNetwork);
+            executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
+            executionContext.Output("##[endgroup]");
+
+            foreach (var container in containers)
+            {
+                container.ContainerNetwork = containerNetwork;
+                await StartContainerAsync(executionContext, container);
+            }
+
+            executionContext.Output("##[group]Waiting for all services to be ready");
+            foreach (var container in containers.Where(c => !c.IsJobContainer))
+            {
+                await ContainerHealthcheck(executionContext, container);
+            }
+            executionContext.Output("##[endgroup]");
        }

        public async Task StopContainersAsync(IExecutionContext executionContext, object data)
@@ -336,69 +162,12 @@ namespace GitHub.Runner.Worker
            List<ContainerInfo> containers = data as List<ContainerInfo>;
            ArgUtil.NotNull(containers, nameof(containers));

-            var podManHandler = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), "kubectlHandler", "index.js");
-            if (File.Exists(podManHandler))
+            foreach (var container in containers)
            {
-                var podmanInput = new ContainerEngineHandlerInput()
-                {
-                    Command = "Remove",
-                    RemoveInput = new ContainersRemoveInput()
-                    {
-                        Network = executionContext.JobContext.Container["network"].ToString(),
-                        JobContainerId = executionContext.JobContext.Container["id"].ToString()
-                    }
-                };
-
-                ContainerEngineHandlerOutput podmanOutput = null;
-                using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
-                {
-                    var redirectStandardIn = Channel.CreateUnbounded<string>(new UnboundedChannelOptions() { SingleReader = true, SingleWriter = true });
-                    redirectStandardIn.Writer.TryWrite(JsonUtility.ToString(podmanInput));
-
-                    processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    {
-                        executionContext.Output(message.Data);
-                    };
-
-                    processInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    {
-                        executionContext.Output(message.Data);
-                        if (podmanOutput == null && message.Data.IndexOf("___CONTAINER_ENGINE_HANDLER_OUTPUT___") >= 0)
-                        {
-                            try
-                            {
-                                podmanOutput = JsonUtility.FromString<ContainerEngineHandlerOutput>(message.Data.Replace("___CONTAINER_ENGINE_HANDLER_OUTPUT___", ""));
-                            }
-                            catch (Exception ex)
-                            {
-                                executionContext.Error(ex);
-                            }
-                        }
-                    };
-
-                    // Execute the process. Exit code 0 should always be returned.
-                    // A non-zero exit code indicates infrastructural failure.
-                    // Task failure should be communicated over STDOUT using ## commands.
-                    await processInvoker.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
-                                                      fileName: Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), "node12", "bin", $"node{IOUtil.ExeExtension}"),
-                                                      arguments: podManHandler,
-                                                      environment: null,
-                                                      requireExitCodeZero: false,
-                                                      outputEncoding: Encoding.UTF8,
-                                                      killProcessOnCancel: false,
-                                                      redirectStandardIn: redirectStandardIn,
-                                                      cancellationToken: executionContext.CancellationToken);
-                }
-            }
-            else
-            {
-                foreach (var container in containers)
-                {
-                    await StopContainerAsync(executionContext, container);
-                }
-                // Remove the container network
-                await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork);
+                await StopContainerAsync(executionContext, container);
            }
+            // Remove the container network
+            await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork);
        }

        private async Task StartContainerAsync(IExecutionContext executionContext, ContainerInfo container)
--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -40,6 +40,7 @@ namespace GitHub.Runner.Worker
        string ScopeName { get; }
        string SiblingScopeName { get; }
        string ContextName { get; }
+        ActionRunStage Stage { get; }
        Task ForceCompleted { get; }
        TaskResult? Result { get; set; }
        TaskResult? Outcome { get; set; }
@@ -62,7 +63,7 @@ namespace GitHub.Runner.Worker

        // Only job level ExecutionContext has PostJobSteps
        Stack<IStep> PostJobSteps { get; }
-        HashSet<Guid> EmbeddedStepsWithPostRegistered{ get; }
+        Dictionary<Guid, string> EmbeddedStepsWithPostRegistered { get; }

        // Keep track of embedded steps states
        Dictionary<Guid, Dictionary<string, string>> EmbeddedIntraActionState { get; }
@@ -76,8 +77,8 @@ namespace GitHub.Runner.Worker
        // Initialize
        void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
        void CancelToken();
-        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null);
-        IExecutionContext CreateEmbeddedChild(string scopeName, string contextName, Guid embeddedId, Dictionary<string, string> intraActionState = null, string siblingScopeName = null);
+        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, ActionRunStage stage, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null);
+        IExecutionContext CreateEmbeddedChild(string scopeName, string contextName, Guid embeddedId, ActionRunStage stage, Dictionary<string, string> intraActionState = null, string siblingScopeName = null);

        // logging
        long Write(string tag, string message);
@@ -144,6 +145,7 @@ namespace GitHub.Runner.Worker
        public string ScopeName { get; private set; }
        public string SiblingScopeName { get; private set; }
        public string ContextName { get; private set; }
+        public ActionRunStage Stage { get; private set; }
        public Task ForceCompleted => _forceCompleted.Task;
        public CancellationToken CancellationToken => _cancellationTokenSource.Token;
        public Dictionary<string, string> IntraActionState { get; private set; }
@@ -168,7 +170,7 @@ namespace GitHub.Runner.Worker
        public HashSet<Guid> StepsWithPostRegistered { get; private set; }

        // Only job level ExecutionContext has EmbeddedStepsWithPostRegistered
-        public HashSet<Guid> EmbeddedStepsWithPostRegistered { get; private set; }
+        public Dictionary<Guid, string> EmbeddedStepsWithPostRegistered { get; private set; }

        public Dictionary<Guid, Dictionary<string, string>> EmbeddedIntraActionState { get; private set; }

@@ -265,12 +267,19 @@ namespace GitHub.Runner.Worker
            string siblingScopeName = null;
            if (this.IsEmbedded)
            {
-                if (step is IActionRunner actionRunner && !Root.EmbeddedStepsWithPostRegistered.Add(actionRunner.Action.Id))
+                if (step is IActionRunner actionRunner)
                {
-                    Trace.Info($"'post' of '{actionRunner.DisplayName}' already push to child post step stack.");
+                    if (Root.EmbeddedStepsWithPostRegistered.ContainsKey(actionRunner.Action.Id))
+                    {
+                        Trace.Info($"'post' of '{actionRunner.DisplayName}' already push to child post step stack.");
+                    }
+                    else 
+                    {
+                        Root.EmbeddedStepsWithPostRegistered[actionRunner.Action.Id] = actionRunner.Condition;    
+                    }
+                    return;
                }
-                return;
-            } 
+            }
            else if (step is IActionRunner actionRunner && !Root.StepsWithPostRegistered.Add(actionRunner.Action.Id))
            {
                Trace.Info($"'post' of '{actionRunner.DisplayName}' already push to post step stack.");
@@ -285,7 +294,7 @@ namespace GitHub.Runner.Worker
            Root.PostJobSteps.Push(step);
        }

-        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null)
+        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, ActionRunStage stage, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null)
        {
            Trace.Entering();

@@ -294,6 +303,7 @@ namespace GitHub.Runner.Worker
            child.Global = Global;
            child.ScopeName = scopeName;
            child.ContextName = contextName;
+            child.Stage = stage;
            child.EmbeddedId = embeddedId;
            child.SiblingScopeName = siblingScopeName;
            child.JobTelemetry = JobTelemetry;
@@ -344,9 +354,9 @@ namespace GitHub.Runner.Worker
        /// An embedded execution context shares the same record ID, record name, logger,
        /// and a linked cancellation token.
        /// </summary>
-        public IExecutionContext CreateEmbeddedChild(string scopeName, string contextName, Guid embeddedId, Dictionary<string, string> intraActionState = null, string siblingScopeName = null)
+        public IExecutionContext CreateEmbeddedChild(string scopeName, string contextName, Guid embeddedId, ActionRunStage stage, Dictionary<string, string> intraActionState = null, string siblingScopeName = null)
        {
-            return Root.CreateChild(_record.Id, _record.Name, _record.Id.ToString("N"), scopeName, contextName, logger: _logger, isEmbedded: true, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token), intraActionState: intraActionState, embeddedId: embeddedId, siblingScopeName: siblingScopeName);
+            return Root.CreateChild(_record.Id, _record.Name, _record.Id.ToString("N"), scopeName, contextName, stage, logger: _logger, isEmbedded: true, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token), intraActionState: intraActionState, embeddedId: embeddedId, siblingScopeName: siblingScopeName);
        }

        public void Start(string currentOperation = null)
@@ -543,8 +553,8 @@ namespace GitHub.Runner.Worker
                }

                _record.WarningCount++;
-            } 
-            else if (issue.Type == IssueType.Notice) 
+            }
+            else if (issue.Type == IssueType.Notice)
            {

                // tracking line number for each issue in log file
@@ -716,10 +726,10 @@ namespace GitHub.Runner.Worker
            StepsWithPostRegistered = new HashSet<Guid>();

            // EmbeddedStepsWithPostRegistered for job ExecutionContext
-            EmbeddedStepsWithPostRegistered = new HashSet<Guid>();
+            EmbeddedStepsWithPostRegistered = new Dictionary<Guid, string>();

            // EmbeddedIntraActionState for job ExecutionContext
-            EmbeddedIntraActionState = new Dictionary<Guid, Dictionary<string,string>>();
+            EmbeddedIntraActionState = new Dictionary<Guid, Dictionary<string, string>>();

            // Job timeline record.
            InitializeTimelineRecord(
@@ -937,7 +947,7 @@ namespace GitHub.Runner.Worker
            }

            var newGuid = Guid.NewGuid();
-            return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, null, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count, siblingScopeName: siblingScopeName);
+            return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, null, ActionRunStage.Post, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count, siblingScopeName: siblingScopeName);
        }
    }

@@ -970,7 +980,7 @@ namespace GitHub.Runner.Worker
        // Do not add a format string overload. See comment on ExecutionContext.Write().
        public static void InfrastructureError(this IExecutionContext context, string message)
        {
-            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true});
+            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true });
        }

        // Do not add a format string overload. See comment on ExecutionContext.Write().
--- a/src/Runner.Worker/Expressions/FailureFunction.cs
+++ b/src/Runner.Worker/Expressions/FailureFunction.cs
@@ -24,8 +24,19 @@ namespace GitHub.Runner.Worker.Expressions
            ArgUtil.NotNull(templateContext, nameof(templateContext));
            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
            ArgUtil.NotNull(executionContext, nameof(executionContext));
-            ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
-            return jobStatus == ActionResult.Failure;
+
+            // Decide based on 'action_status' for composite MAIN steps and 'job.status' for pre, post and job-level steps
+            var isCompositeMainStep = executionContext.IsEmbedded && executionContext.Stage == ActionRunStage.Main;
+            if (isCompositeMainStep)
+            {
+                ActionResult actionStatus = EnumUtil.TryParse<ActionResult>(executionContext.GetGitHubContext("action_status")) ?? ActionResult.Success;
+                return actionStatus == ActionResult.Failure;
+            }
+            else
+            {
+                ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
+                return jobStatus == ActionResult.Failure;
+            }
        }
    }
 }
--- a/src/Runner.Worker/Expressions/SuccessFunction.cs
+++ b/src/Runner.Worker/Expressions/SuccessFunction.cs
@@ -24,8 +24,19 @@ namespace GitHub.Runner.Worker.Expressions
            ArgUtil.NotNull(templateContext, nameof(templateContext));
            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
            ArgUtil.NotNull(executionContext, nameof(executionContext));
-            ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
-            return jobStatus == ActionResult.Success;
+
+            // Decide based on 'action_status' for composite MAIN steps and 'job.status' for pre, post and job-level steps
+            var isCompositeMainStep = executionContext.IsEmbedded && executionContext.Stage == ActionRunStage.Main;
+            if (isCompositeMainStep)
+            {
+                ActionResult actionStatus = EnumUtil.TryParse<ActionResult>(executionContext.GetGitHubContext("action_status")) ?? ActionResult.Success;
+                return actionStatus == ActionResult.Success;
+            }
+            else
+            {
+                ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
+                return jobStatus == ActionResult.Success;
+            }
        }
    }
 }
--- a/src/Runner.Worker/Handlers/CompositeActionHandler.cs
+++ b/src/Runner.Worker/Handlers/CompositeActionHandler.cs
@@ -50,8 +50,9 @@ namespace GitHub.Runner.Worker.Handlers
                // Only register post steps for steps that actually ran
                foreach (var step in Data.PostSteps.ToList())
                {
-                    if (ExecutionContext.Root.EmbeddedStepsWithPostRegistered.Contains(step.Id))
+                    if (ExecutionContext.Root.EmbeddedStepsWithPostRegistered.ContainsKey(step.Id))
                    {
+                        step.Condition = ExecutionContext.Root.EmbeddedStepsWithPostRegistered[step.Id];
                        steps.Add(step);
                    }
                    else
@@ -124,7 +125,7 @@ namespace GitHub.Runner.Worker.Handlers
                    {
                        ArgUtil.NotNull(step, step.DisplayName);
                        var stepId = $"__{Guid.NewGuid()}";
-                        step.ExecutionContext = ExecutionContext.CreateEmbeddedChild(childScopeName, stepId, Guid.NewGuid());
+                        step.ExecutionContext = ExecutionContext.CreateEmbeddedChild(childScopeName, stepId, Guid.NewGuid(), stage);
                        embeddedSteps.Add(step);
                    }
                }
@@ -143,7 +144,7 @@ namespace GitHub.Runner.Worker.Handlers
                    step.Stage = stage;
                    step.Condition = stepData.Condition;
                    ExecutionContext.Root.EmbeddedIntraActionState.TryGetValue(step.Action.Id, out var intraActionState);
-                    step.ExecutionContext = ExecutionContext.CreateEmbeddedChild(childScopeName, stepData.ContextName, step.Action.Id, intraActionState: intraActionState, siblingScopeName: siblingScopeName);
+                    step.ExecutionContext = ExecutionContext.CreateEmbeddedChild(childScopeName, stepData.ContextName, step.Action.Id, stage, intraActionState: intraActionState, siblingScopeName: siblingScopeName);
                    step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
                    if (!String.IsNullOrEmpty(ExecutionContext.SiblingScopeName))
                    {
@@ -241,6 +242,10 @@ namespace GitHub.Runner.Worker.Handlers
                step.ExecutionContext.ExpressionFunctions.Add(new FunctionInfo<FailureFunction>(PipelineTemplateConstants.Failure, 0, 0));
                step.ExecutionContext.ExpressionFunctions.Add(new FunctionInfo<SuccessFunction>(PipelineTemplateConstants.Success, 0, 0));

+                // Set action_status to the success of the current composite action
+                var actionResult = ExecutionContext.Result?.ToActionResult() ?? ActionResult.Success;
+                step.ExecutionContext.SetGitHubContext("action_status", actionResult.ToString());
+
                // Initialize env context
                Trace.Info("Initialize Env context for embedded step");
 #if OS_WINDOWS
@@ -295,108 +300,100 @@ namespace GitHub.Runner.Worker.Handlers
                CancellationTokenRegistration? jobCancelRegister = null;
                try
                {
-                    // For main steps just run the action
-                    if (stage == ActionRunStage.Main)
+                    // Register job cancellation call back only if job cancellation token not been fire before each step run
+                    if (!ExecutionContext.Root.CancellationToken.IsCancellationRequested)
+                    {
+                        // Test the condition again. The job was canceled after the condition was originally evaluated.
+                        jobCancelRegister = ExecutionContext.Root.CancellationToken.Register(() =>
+                        {
+                            // Mark job as cancelled
+                            ExecutionContext.Root.Result = TaskResult.Canceled;
+                            ExecutionContext.Root.JobContext.Status = ExecutionContext.Root.Result?.ToActionResult();
+                            
+                            step.ExecutionContext.Debug($"Re-evaluate condition on job cancellation for step: '{step.DisplayName}'.");
+                            var conditionReTestTraceWriter = new ConditionTraceWriter(Trace, null); // host tracing only
+                            var conditionReTestResult = false;
+                            if (HostContext.RunnerShutdownToken.IsCancellationRequested)
+                            {
+                                step.ExecutionContext.Debug($"Skip Re-evaluate condition on runner shutdown.");
+                            }
+                            else
+                            {
+                                try
+                                {
+                                    var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(conditionReTestTraceWriter);
+                                    var condition = new BasicExpressionToken(null, null, null, step.Condition);
+                                    conditionReTestResult = templateEvaluator.EvaluateStepIf(condition, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, step.ExecutionContext.ToExpressionState());
+                                }
+                                catch (Exception ex)
+                                {
+                                    // Cancel the step since we get exception while re-evaluate step condition
+                                    Trace.Info("Caught exception from expression when re-test condition on job cancellation.");
+                                    step.ExecutionContext.Error(ex);
+                                }
+                            }
+
+                            if (!conditionReTestResult)
+                            {
+                                // Cancel the step
+                                Trace.Info("Cancel current running step.");
+                                step.ExecutionContext.CancelToken();
+                            }
+                        });
+                    }
+                    else
+                    {
+                        if (ExecutionContext.Root.Result != TaskResult.Canceled)
+                        {
+                            // Mark job as cancelled
+                            ExecutionContext.Root.Result = TaskResult.Canceled;
+                            ExecutionContext.Root.JobContext.Status = ExecutionContext.Root.Result?.ToActionResult();
+                        }
+                    }
+                    // Evaluate condition
+                    step.ExecutionContext.Debug($"Evaluating condition for step: '{step.DisplayName}'");
+                    var conditionTraceWriter = new ConditionTraceWriter(Trace, step.ExecutionContext);
+                    var conditionResult = false;
+                    var conditionEvaluateError = default(Exception);
+                    if (HostContext.RunnerShutdownToken.IsCancellationRequested)
+                    {
+                        step.ExecutionContext.Debug($"Skip evaluate condition on runner shutdown.");
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(conditionTraceWriter);
+                            var condition = new BasicExpressionToken(null, null, null, step.Condition);
+                            conditionResult = templateEvaluator.EvaluateStepIf(condition, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, step.ExecutionContext.ToExpressionState());
+                        }
+                        catch (Exception ex)
+                        {
+                            Trace.Info("Caught exception from expression.");
+                            Trace.Error(ex);
+                            conditionEvaluateError = ex;
+                        }
+                    }
+                    if (!conditionResult && conditionEvaluateError == null)
+                    {
+                        // Condition is false
+                        Trace.Info("Skipping step due to condition evaluation.");
+                        step.ExecutionContext.Result = TaskResult.Skipped;
+                        continue;
+                    }
+                    else if (conditionEvaluateError != null)
+                    {
+                        // Condition error
+                        step.ExecutionContext.Error(conditionEvaluateError);
+                        step.ExecutionContext.Result = TaskResult.Failed;
+                        ExecutionContext.Result = TaskResult.Failed;
+                        break;
+                    }
+                    else
                    {
                        await RunStepAsync(step);
                    }
-                    // We need to evaluate conditions for pre/post steps
-                    else
-                    {
-                        // Register job cancellation call back only if job cancellation token not been fire before each step run
-                        if (!ExecutionContext.Root.CancellationToken.IsCancellationRequested)
-                        {
-                            // Test the condition again. The job was canceled after the condition was originally evaluated.
-                            jobCancelRegister = ExecutionContext.Root.CancellationToken.Register(() =>
-                            {
-                                // Mark job as cancelled
-                                ExecutionContext.Root.Result = TaskResult.Canceled;
-                                ExecutionContext.Root.JobContext.Status = ExecutionContext.Root.Result?.ToActionResult();
-
-                                step.ExecutionContext.Debug($"Re-evaluate condition on job cancellation for step: '{step.DisplayName}'.");
-                                var conditionReTestTraceWriter = new ConditionTraceWriter(Trace, null); // host tracing only
-                                var conditionReTestResult = false;
-                                if (HostContext.RunnerShutdownToken.IsCancellationRequested)
-                                {
-                                    step.ExecutionContext.Debug($"Skip Re-evaluate condition on runner shutdown.");
-                                }
-                                else
-                                {
-                                    try
-                                    {
-                                        var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(conditionReTestTraceWriter);
-                                        var condition = new BasicExpressionToken(null, null, null, step.Condition);
-                                        conditionReTestResult = templateEvaluator.EvaluateStepIf(condition, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, step.ExecutionContext.ToExpressionState());
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        // Cancel the step since we get exception while re-evaluate step condition
-                                        Trace.Info("Caught exception from expression when re-test condition on job cancellation.");
-                                        step.ExecutionContext.Error(ex);
-                                    }
-                                }
-
-                                if (!conditionReTestResult)
-                                {
-                                    // Cancel the step
-                                    Trace.Info("Cancel current running step.");
-                                    step.ExecutionContext.CancelToken();
-                                }
-                            });
-                        }
-                        else
-                        {
-                            if (ExecutionContext.Root.Result != TaskResult.Canceled)
-                            {
-                                // Mark job as cancelled
-                                ExecutionContext.Root.Result = TaskResult.Canceled;
-                                ExecutionContext.Root.JobContext.Status = ExecutionContext.Root.Result?.ToActionResult();
-                            }
-                        }
-                        // Evaluate condition
-                        step.ExecutionContext.Debug($"Evaluating condition for step: '{step.DisplayName}'");
-                        var conditionTraceWriter = new ConditionTraceWriter(Trace, step.ExecutionContext);
-                        var conditionResult = false;
-                        var conditionEvaluateError = default(Exception);
-                        if (HostContext.RunnerShutdownToken.IsCancellationRequested)
-                        {
-                            step.ExecutionContext.Debug($"Skip evaluate condition on runner shutdown.");
-                        }
-                        else
-                        {
-                            try
-                            {
-                                var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(conditionTraceWriter);
-                                var condition = new BasicExpressionToken(null, null, null, step.Condition);
-                                conditionResult = templateEvaluator.EvaluateStepIf(condition, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, step.ExecutionContext.ToExpressionState());
-                            }
-                            catch (Exception ex)
-                            {
-                                Trace.Info("Caught exception from expression.");
-                                Trace.Error(ex);
-                                conditionEvaluateError = ex;
-                            }
-                        }
-                        if (!conditionResult && conditionEvaluateError == null)
-                        {
-                            // Condition is false
-                            Trace.Info("Skipping step due to condition evaluation.");
-                            step.ExecutionContext.Result = TaskResult.Skipped;
-                            continue;
-                        }
-                        else if (conditionEvaluateError != null)
-                        {
-                            // Condition error
-                            step.ExecutionContext.Error(conditionEvaluateError);
-                            step.ExecutionContext.Result = TaskResult.Failed;
-                            ExecutionContext.Result = TaskResult.Failed;
-                            break;
-                        }
-                        else
-                        {
-                            await RunStepAsync(step);
-                        }
-                    }
+                
                }
                finally
                {
@@ -412,12 +409,6 @@ namespace GitHub.Runner.Worker.Handlers
                {
                    Trace.Info($"Update job result with current composite step result '{step.ExecutionContext.Result}'.");
                    ExecutionContext.Result = TaskResultUtil.MergeTaskResults(ExecutionContext.Result, step.ExecutionContext.Result.Value);
-
-                    // We should run cleanup even if one of the cleanup step fails
-                    if (stage != ActionRunStage.Post)
-                    {
-                        break;
-                    }
                }
            }
        }
--- a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
+++ b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
@@ -83,7 +83,7 @@ namespace GitHub.Runner.Worker.Handlers
                    HasPreStep = Data.HasPre,
                    HasPostStep = Data.HasPost,
                    IsEmbedded = ExecutionContext.IsEmbedded,
-                    Type = "node12"
+                    Type = Data.NodeVersion
                };
                ExecutionContext.Root.ActionsStepsTelemetry.Add(telemetry);
            }
@@ -99,7 +99,7 @@ namespace GitHub.Runner.Worker.Handlers
                workingDirectory = HostContext.GetDirectory(WellKnownDirectory.Work);
            }

-            var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext);
+            var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext, Data.NodeVersion);
            string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");

            // Format the arguments passed to node.
--- a/src/Runner.Worker/Handlers/StepHost.cs
+++ b/src/Runner.Worker/Handlers/StepHost.cs
@@ -21,11 +21,9 @@ namespace GitHub.Runner.Worker.Handlers
        event EventHandler<ProcessDataReceivedEventArgs> OutputDataReceived;
        event EventHandler<ProcessDataReceivedEventArgs> ErrorDataReceived;

-        IExecutionContext ExecutionContext { get; set; }
-
        string ResolvePathForStepHost(string path);

-        Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext);
+        Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext, string preferredVersion);

        Task<int> ExecuteAsync(string workingDirectory,
                               string fileName,
@@ -55,16 +53,14 @@ namespace GitHub.Runner.Worker.Handlers
        public event EventHandler<ProcessDataReceivedEventArgs> OutputDataReceived;
        public event EventHandler<ProcessDataReceivedEventArgs> ErrorDataReceived;

-        public IExecutionContext ExecutionContext { get; set; }
-
        public string ResolvePathForStepHost(string path)
        {
            return path;
        }

-        public Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext)
+        public Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext, string preferredVersion)
        {
-            return Task.FromResult<string>("node12");
+            return Task.FromResult<string>(preferredVersion);
        }

        public async Task<int> ExecuteAsync(string workingDirectory,
@@ -103,8 +99,6 @@ namespace GitHub.Runner.Worker.Handlers
        public event EventHandler<ProcessDataReceivedEventArgs> OutputDataReceived;
        public event EventHandler<ProcessDataReceivedEventArgs> ErrorDataReceived;

-        public IExecutionContext ExecutionContext { get; set; }
-
        public string ResolvePathForStepHost(string path)
        {
            // make sure container exist.
@@ -129,7 +123,7 @@ namespace GitHub.Runner.Worker.Handlers
            }
        }

-        public async Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext)
+        public async Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext, string preferredVersion)
        {
            // Best effort to determine a compatible node runtime
            // There may be more variation in which libraries are linked than just musl/glibc,
@@ -154,14 +148,14 @@ namespace GitHub.Runner.Worker.Handlers
                            var msg = $"JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected {os} {arch}";
                            throw new NotSupportedException(msg);
                        }
-                        nodeExternal = "node12_alpine";
+                        nodeExternal = $"{preferredVersion}_alpine";
                        executionContext.Debug($"Container distribution is alpine. Running JavaScript Action with external tool: {nodeExternal}");
                        return nodeExternal;
                    }
                }
            }
            // Optimistically use the default
-            nodeExternal = "node12";
+            nodeExternal = preferredVersion;
            executionContext.Debug($"Running JavaScript Action with default external tool: {nodeExternal}");
            return nodeExternal;
        }
@@ -180,138 +174,69 @@ namespace GitHub.Runner.Worker.Handlers
            ArgUtil.NotNull(Container, nameof(Container));
            ArgUtil.NotNullOrEmpty(Container.ContainerId, nameof(Container.ContainerId));

-            var podManHandler = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), "kubectlHandler", "index.js");
-            if (File.Exists(podManHandler))
+            var dockerManager = HostContext.GetService<IDockerCommandManager>();
+            string dockerClientPath = dockerManager.DockerPath;
+
+            // Usage:  docker exec [OPTIONS] CONTAINER COMMAND [ARG...]
+            IList<string> dockerCommandArgs = new List<string>();
+            dockerCommandArgs.Add($"exec");
+
+            // [OPTIONS]
+            dockerCommandArgs.Add($"-i");
+            dockerCommandArgs.Add($"--workdir {workingDirectory}");
+            foreach (var env in environment)
            {
-                var podmanInput = new ContainerEngineHandlerInput()
-                {
-                    Command = "Exec",
-                    ExecInput = new JobContainerExecInput()
-                    {
-                        JobContainer = this.Container,
-                        WorkingDirectory = workingDirectory,
-                        FileName = fileName,
-                        Arguments = arguments,
-                        EnvironmentKeys = environment.Keys.ToList(),
-                        EnvironmentVariables = environment.ToDictionary(x => x.Key, y => y.Value)
-                    }
-                };
-
-                // make sure all env are using container path
-                foreach (var envKey in environment.Keys.ToList())
-                {
-                    environment[envKey] = this.Container.TranslateToContainerPath(environment[envKey]);
-                }
-
-                // ContainerEngineHandlerOutput podmanOutput = null;
-                using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
-                {
-                    var redirectStandardIn = Channel.CreateUnbounded<string>(new UnboundedChannelOptions() { SingleReader = true, SingleWriter = true });
-                    redirectStandardIn.Writer.TryWrite(JsonUtility.ToString(podmanInput));
-
-                    // processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    // {
-                    //     ExecutionContext.Output(message.Data);
-                    // };
-
-                    // processInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
-                    // {
-                    //     executionContext.Output(message.Data);
-                    //     if (podmanOutput == null && message.Data.IndexOf("___CONTAINER_ENGINE_HANDLER_OUTPUT___") >= 0)
-                    //     {
-                    //         try
-                    //         {
-                    //             podmanOutput = JsonUtility.FromString<ContainerEngineHandlerOutput>(message.Data.Replace("___CONTAINER_ENGINE_HANDLER_OUTPUT___", ""));
-                    //         }
-                    //         catch (Exception ex)
-                    //         {
-                    //             executionContext.Error(ex);
-                    //         }
-                    //     }
-                    // };
-                    processInvoker.OutputDataReceived += OutputDataReceived;
-                    processInvoker.ErrorDataReceived += ErrorDataReceived;
-
-                    // Execute the process. Exit code 0 should always be returned.
-                    // A non-zero exit code indicates infrastructural failure.
-                    // Task failure should be communicated over STDOUT using ## commands.
-                    return await processInvoker.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
-                                                      fileName: Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), "node12", "bin", $"node{IOUtil.ExeExtension}"),
-                                                      arguments: podManHandler,
-                                                      environment: environment,
-                                                      requireExitCodeZero: requireExitCodeZero,
-                                                      outputEncoding: Encoding.UTF8,
-                                                      killProcessOnCancel: killProcessOnCancel,
-                                                      redirectStandardIn: redirectStandardIn,
-                                                      cancellationToken: cancellationToken);
-                }
+                // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
+                // the value directly in the command
+                dockerCommandArgs.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
            }
-            else
+            if (!string.IsNullOrEmpty(PrependPath))
            {
-                var dockerManager = HostContext.GetService<IDockerCommandManager>();
-                string dockerClientPath = dockerManager.DockerPath;
+                // Prepend tool paths to container's PATH
+                var fullPath = !string.IsNullOrEmpty(Container.ContainerRuntimePath) ? $"{PrependPath}:{Container.ContainerRuntimePath}" : PrependPath;
+                dockerCommandArgs.Add($"-e PATH=\"{fullPath}\"");
+            }

-                // Usage:  docker exec [OPTIONS] CONTAINER COMMAND [ARG...]
-                IList<string> dockerCommandArgs = new List<string>();
-                dockerCommandArgs.Add($"exec");
+            // CONTAINER
+            dockerCommandArgs.Add($"{Container.ContainerId}");

-                // [OPTIONS]
-                dockerCommandArgs.Add($"-i");
-                dockerCommandArgs.Add($"--workdir {workingDirectory}");
-                foreach (var env in environment)
-                {
-                    // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
-                    // the value directly in the command
-                    dockerCommandArgs.Add($"-e {env.Key}");
-                }
-                if (!string.IsNullOrEmpty(PrependPath))
-                {
-                    // Prepend tool paths to container's PATH
-                    var fullPath = !string.IsNullOrEmpty(Container.ContainerRuntimePath) ? $"{PrependPath}:{Container.ContainerRuntimePath}" : PrependPath;
-                    dockerCommandArgs.Add($"-e PATH=\"{fullPath}\"");
-                }
+            // COMMAND
+            dockerCommandArgs.Add(fileName);

-                // CONTAINER
-                dockerCommandArgs.Add($"{Container.ContainerId}");
+            // [ARG...]
+            dockerCommandArgs.Add(arguments);

-                // COMMAND
-                dockerCommandArgs.Add(fileName);
+            string dockerCommandArgstring = string.Join(" ", dockerCommandArgs);

-                // [ARG...]
-                dockerCommandArgs.Add(arguments);
+            // make sure all env are using container path
+            foreach (var envKey in environment.Keys.ToList())
+            {
+                environment[envKey] = this.Container.TranslateToContainerPath(environment[envKey]);
+            }

-                string dockerCommandArgstring = string.Join(" ", dockerCommandArgs);
-
-                // make sure all env are using container path
-                foreach (var envKey in environment.Keys.ToList())
-                {
-                    environment[envKey] = this.Container.TranslateToContainerPath(environment[envKey]);
-                }
-
-                using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
-                {
-                    processInvoker.OutputDataReceived += OutputDataReceived;
-                    processInvoker.ErrorDataReceived += ErrorDataReceived;
+            using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
+            {
+                processInvoker.OutputDataReceived += OutputDataReceived;
+                processInvoker.ErrorDataReceived += ErrorDataReceived;

 #if OS_WINDOWS
                // It appears that node.exe outputs UTF8 when not in TTY mode.
                outputEncoding = Encoding.UTF8;
 #else
-                    // Let .NET choose the default.
-                    outputEncoding = null;
+                // Let .NET choose the default.
+                outputEncoding = null;
 #endif

-                    return await processInvoker.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
-                                                             fileName: dockerClientPath,
-                                                             arguments: dockerCommandArgstring,
-                                                             environment: environment,
-                                                             requireExitCodeZero: requireExitCodeZero,
-                                                             outputEncoding: outputEncoding,
-                                                             killProcessOnCancel: killProcessOnCancel,
-                                                             redirectStandardIn: null,
-                                                             inheritConsoleHandler: inheritConsoleHandler,
-                                                             cancellationToken: cancellationToken);
-                }
+                return await processInvoker.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
+                                                         fileName: dockerClientPath,
+                                                         arguments: dockerCommandArgstring,
+                                                         environment: environment,
+                                                         requireExitCodeZero: requireExitCodeZero,
+                                                         outputEncoding: outputEncoding,
+                                                         killProcessOnCancel: killProcessOnCancel,
+                                                         redirectStandardIn: null,
+                                                         inheritConsoleHandler: inheritConsoleHandler,
+                                                         cancellationToken: cancellationToken);
            }
        }
    }
--- a/src/Runner.Worker/JobExtension.cs
+++ b/src/Runner.Worker/JobExtension.cs
@@ -55,7 +55,7 @@ namespace GitHub.Runner.Worker
            ArgUtil.NotNull(message, nameof(message));

            // Create a new timeline record for 'Set up job'
-            IExecutionContext context = jobContext.CreateChild(Guid.NewGuid(), "Set up job", $"{nameof(JobExtension)}_Init", null, null);
+            IExecutionContext context = jobContext.CreateChild(Guid.NewGuid(), "Set up job", $"{nameof(JobExtension)}_Init", null, null, ActionRunStage.Pre);

            List<IStep> preJobSteps = new List<IStep>();
            List<IStep> jobSteps = new List<IStep>();
@@ -142,6 +142,12 @@ namespace GitHub.Runner.Worker
                        Trace.Error(ex);
                    }

+                    var secretSource = context.GetGitHubContext("secret_source");
+                    if (!string.IsNullOrEmpty(secretSource))
+                    {
+                        context.Output($"Secret source: {secretSource}");
+                    }
+
                    var repoFullName = context.GetGitHubContext("repository");
                    ArgUtil.NotNull(repoFullName, nameof(repoFullName));
                    context.Debug($"Primary repository: {repoFullName}");
@@ -306,13 +312,13 @@ namespace GitHub.Runner.Worker
                            JobExtensionRunner extensionStep = step as JobExtensionRunner;
                            ArgUtil.NotNull(extensionStep, extensionStep.DisplayName);
                            Guid stepId = Guid.NewGuid();
-                            extensionStep.ExecutionContext = jobContext.CreateChild(stepId, extensionStep.DisplayName, null, null, stepId.ToString("N"));
+                            extensionStep.ExecutionContext = jobContext.CreateChild(stepId, extensionStep.DisplayName, null, null, stepId.ToString("N"), ActionRunStage.Pre);
                        }
                        else if (step is IActionRunner actionStep)
                        {
                            ArgUtil.NotNull(actionStep, step.DisplayName);
                            Guid stepId = Guid.NewGuid();
-                            actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, stepId.ToString("N"), null, null, intraActionStates[actionStep.Action.Id]);
+                            actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, stepId.ToString("N"), null, null, ActionRunStage.Pre, intraActionStates[actionStep.Action.Id]);
                        }
                    }

@@ -323,7 +329,7 @@ namespace GitHub.Runner.Worker
                        {
                            ArgUtil.NotNull(actionStep, step.DisplayName);
                            intraActionStates.TryGetValue(actionStep.Action.Id, out var intraActionState);
-                            actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Name, null, actionStep.Action.ContextName, intraActionState);
+                            actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Name, null, actionStep.Action.ContextName, ActionRunStage.Main, intraActionState);
                        }
                    }

@@ -394,7 +400,7 @@ namespace GitHub.Runner.Worker
            ArgUtil.NotNull(jobContext, nameof(jobContext));

            // create a new timeline record node for 'Finalize job'
-            IExecutionContext context = jobContext.CreateChild(Guid.NewGuid(), "Complete job", $"{nameof(JobExtension)}_Final", null, null);
+            IExecutionContext context = jobContext.CreateChild(Guid.NewGuid(), "Complete job", $"{nameof(JobExtension)}_Final", null, null, ActionRunStage.Post);
            using (var register = jobContext.CancellationToken.Register(() => { context.CancelToken(); }))
            {
                try
--- a/src/Runner.Worker/JobRunner.cs
+++ b/src/Runner.Worker/JobRunner.cs
@@ -106,6 +106,7 @@ namespace GitHub.Runner.Worker
                }

                jobContext.SetRunnerContext("os", VarUtil.OS);
+                jobContext.SetRunnerContext("arch", VarUtil.OSArchitecture);

                var runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
                jobContext.SetRunnerContext("name", runnerSettings.AgentName);
--- a/src/Runner.Worker/Runner.Worker.csproj
+++ b/src/Runner.Worker/Runner.Worker.csproj
@@ -5,7 +5,6 @@
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
--- a/src/Runner.Worker/action_yaml.json
+++ b/src/Runner.Worker/action_yaml.json
@@ -46,7 +46,7 @@
        "runs": {
            "one-of": [
                "container-runs",
-                "node12-runs",
+                "node-runs",
                "plugin-runs",
                "composite-runs"
            ]
@@ -80,7 +80,7 @@
                "loose-value-type": "string"
            }
        },
-        "node12-runs": {
+        "node-runs": {
            "mapping": {
                "properties": {
                    "using": "non-empty-string",
@@ -112,10 +112,10 @@
                "item-type": "composite-step"
            }
        },
-        "composite-step":{
+        "composite-step": {
            "one-of": [
                "run-step",
-                "uses-step" 
+                "uses-step"
            ]
        },
        "run-step": {
@@ -123,6 +123,7 @@
                "properties": {
                    "name": "string-steps-context",
                    "id": "non-empty-string",
+                    "if": "step-if",
                    "run": {
                        "type": "string-steps-context",
                        "required": true
@@ -141,6 +142,7 @@
                "properties": {
                    "name": "string-steps-context",
                    "id": "non-empty-string",
+                    "if": "step-if",
                    "uses": {
                        "type": "non-empty-string",
                        "required": true
@@ -216,6 +218,24 @@
                "loose-value-type": "string"
            }
        },
+        "step-if": {
+            "context": [
+              "github",
+              "inputs",
+              "strategy",
+              "matrix",
+              "steps",
+              "job",
+              "runner",
+              "env",
+              "always(0,0)",
+              "failure(0,0)",
+              "cancelled(0,0)",
+              "success(0,0)",
+              "hashFiles(1,255)"
+            ],
+            "string": {}
+        },
        "step-with": {
            "context": [
                "github",
@@ -234,4 +254,4 @@
            }
        }
    }
-}
+}
--- a/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
+++ b/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
@@ -768,6 +768,7 @@ namespace GitHub.DistributedTask.WebApi
        /// <param name="poolId"></param>
        /// <param name="agentId"></param>
        /// <param name="currentState"></param>
+        /// <param name="updateTrace"></param>
        /// <param name="userState"></param>
        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
        [EditorBrowsable(EditorBrowsableState.Never)]
@@ -775,6 +776,7 @@ namespace GitHub.DistributedTask.WebApi
            int poolId,
            int agentId,
            string currentState,
+            string updateTrace,
            object userState = null,
            CancellationToken cancellationToken = default)
        {
@@ -784,6 +786,7 @@ namespace GitHub.DistributedTask.WebApi

            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
            queryParams.Add("currentState", currentState);
+            queryParams.Add("updateTrace", updateTrace);

            return SendAsync<TaskAgent>(
                httpMethod,
@@ -794,65 +797,5 @@ namespace GitHub.DistributedTask.WebApi
                userState: userState,
                cancellationToken: cancellationToken);
        }
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="poolId"></param>
-        /// <param name="agentId"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public Task<String> GetAgentAuthUrlAsync(
-            int poolId,
-            int agentId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("a82a119c-1e46-44b6-8d75-c82a79cf975b");
-            object routeValues = new { poolId = poolId, agentId = agentId };
-
-            return SendAsync<String>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="poolId"></param>
-        /// <param name="agentId"></param>
-        /// <param name="error"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual async Task ReportAgentAuthUrlMigrationErrorAsync(
-            int poolId,
-            int agentId,
-            string error,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("a82a119c-1e46-44b6-8d75-c82a79cf975b");
-            object routeValues = new { poolId = poolId, agentId = agentId };
-            HttpContent content = new ObjectContent<string>(error, new VssJsonMediaTypeFormatter(true));
-
-            using (HttpResponseMessage response = await SendAsync(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content).ConfigureAwait(false))
-            {
-                return;
-            }
-        }
    }
 }
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
@@ -638,6 +638,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Matrix),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Steps),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.GitHub),
+            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Inputs),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Job),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Runner),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Env),
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -5,7 +5,6 @@
        <OutputType>Library</OutputType>
        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-        <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
        <NoWarn>NU1701;NU1603</NoWarn>
        <Version>$(Version)</Version>
        <DefineConstants>TRACE</DefineConstants>
--- a/src/Test/L0/Container/DockerUtilL0.cs
+++ b/src/Test/L0/Container/DockerUtilL0.cs
@@ -144,5 +144,54 @@ namespace GitHub.Runner.Common.Tests.Worker.Container
            var actual = DockerUtil.ParseRegistryHostnameFromImageName(input);
            Assert.Equal(expected, actual);
        }
+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        [InlineData("", "")]
+        [InlineData("foo", "foo")]
+        [InlineData("foo \\ bar", "foo \\ bar")]
+        [InlineData("foo \\", "foo \\\\")]
+        [InlineData("foo \\\\", "foo \\\\\\\\")]
+        [InlineData("foo \\\" bar", "foo \\\\\\\" bar")]
+        [InlineData("foo \\\\\" bar", "foo \\\\\\\\\\\" bar")]
+        public void CreateEscapedOption_keyOnly(string input, string escaped)
+        {
+            var flag = "--example";
+            var actual = DockerUtil.CreateEscapedOption(flag, input);
+            string expected;
+            if (String.IsNullOrEmpty(input))
+            {
+                expected = "";
+            }
+            else
+            {
+                expected = $"{flag} \"{escaped}\"";
+            }
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        [InlineData("foo", "bar", "foo=bar")]
+        [InlineData("foo\\", "bar", "foo\\=bar")]
+        [InlineData("foo\\", "bar\\", "foo\\=bar\\\\")]
+        [InlineData("foo \\","bar \\", "foo \\=bar \\\\")]
+        public void CreateEscapedOption_keyValue(string keyInput, string valueInput, string escapedString)
+        {
+            var flag = "--example";
+            var actual = DockerUtil.CreateEscapedOption(flag, keyInput, valueInput);
+            string expected;
+            if (String.IsNullOrEmpty(keyInput))
+            {
+                expected = "";
+            }
+            else
+            {
+                expected = $"{flag} \"{escapedString}\"";
+            }
+            Assert.Equal(expected, actual);
+        }
    }
 }
--- a/src/Test/L0/ProcessInvokerL0.cs
+++ b/src/Test/L0/ProcessInvokerL0.cs
@@ -129,7 +129,76 @@ namespace GitHub.Runner.Common.Tests
                }
            }
        }
+#if OS_WINDOWS
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public async Task SetTestEnvWithNullInKey()
+        {
+            using (TestHostContext hc = new TestHostContext(this))
+            {
+                Tracing trace = hc.GetTrace();

+                Int32 exitCode = -1;
+                var processInvoker = new ProcessInvokerWrapper();
+                processInvoker.Initialize(hc);
+                var stdout = new List<string>();
+                var stderr = new List<string>();
+                processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
+                {
+                    trace.Info(e.Data);
+                    stdout.Add(e.Data);
+                };
+                processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
+                {
+                    trace.Info(e.Data);
+                    stderr.Add(e.Data);
+                };
+
+                exitCode = await processInvoker.ExecuteAsync("", "cmd.exe", "/c \"echo %TEST%\"",  new Dictionary<string, string>() { { "TEST\0second", "first" } }, CancellationToken.None);
+
+
+                trace.Info("Exit Code: {0}", exitCode);
+                Assert.Equal(0, exitCode);
+                Assert.Equal("first", stdout.First(x => !string.IsNullOrWhiteSpace(x)));
+
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public async Task SetTestEnvWithNullInValue()
+        {
+            using (TestHostContext hc = new TestHostContext(this))
+            {
+                Tracing trace = hc.GetTrace();
+
+                Int32 exitCode = -1;
+                var processInvoker = new ProcessInvokerWrapper();
+                processInvoker.Initialize(hc);
+                var stdout = new List<string>();
+                var stderr = new List<string>();
+                processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
+                {
+                    trace.Info(e.Data);
+                    stdout.Add(e.Data);
+                };
+                processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
+                {
+                    trace.Info(e.Data);
+                    stderr.Add(e.Data);
+                };
+
+                exitCode = await processInvoker.ExecuteAsync("", "cmd.exe", "/c \"echo %TEST%\"",  new Dictionary<string, string>() { { "TEST", "first\0second" } }, CancellationToken.None);
+
+                trace.Info("Exit Code: {0}", exitCode);
+                Assert.Equal(0, exitCode);
+                Assert.Equal("first", stdout.First(x => !string.IsNullOrWhiteSpace(x)));
+
+            }
+        }
+#endif
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Common")]
@@ -197,7 +266,7 @@ namespace GitHub.Runner.Common.Tests
 #if OS_WINDOWS
                execTask = processInvoker.ExecuteAsync("", "cmd.exe", $"/c \"choice /T {SecondsToRun} /D y\"", null, tokenSource.Token);
 #else
-                execTask = processInvoker.ExecuteAsync("", "bash", $"-c \"sleep {SecondsToRun}s\"", null, tokenSource.Token);
+                execTask = processInvoker.ExecuteAsync("", "bash", $"-c \"sleep {SecondsToRun}\"", null, tokenSource.Token);
 #endif
                await Task.Delay(500);
                tokenSource.Cancel();
--- a/src/Test/L0/Worker/ActionManagerL0.cs
+++ b/src/Test/L0/Worker/ActionManagerL0.cs
@@ -965,7 +965,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                };

                //Act
-                var result =  await _actionManager.PrepareActionsAsync(_ec.Object, actions);
+                var result = await _actionManager.PrepareActionsAsync(_ec.Object, actions);

                //Assert
                Assert.Equal(1, result.PreStepTracker.Count);
@@ -1288,7 +1288,7 @@ runs:
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void LoadsNodeActionDefinition()
+        public void LoadsNode12ActionDefinition()
        {
            try
            {
@@ -1344,8 +1344,78 @@ runs:
                Assert.True(string.IsNullOrEmpty(inputDefaults["entryPoint"]));
                Assert.NotNull(definition.Data.Execution); // execution

-                Assert.NotNull((definition.Data.Execution as NodeJSActionExecutionData));
+                Assert.NotNull(definition.Data.Execution as NodeJSActionExecutionData);
                Assert.Equal("task.js", (definition.Data.Execution as NodeJSActionExecutionData).Script);
+                Assert.Equal("node12", (definition.Data.Execution as NodeJSActionExecutionData).NodeVersion);
+            }
+            finally
+            {
+                Teardown();
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void LoadsNode16ActionDefinition()
+        {
+            try
+            {
+                // Arrange.
+                Setup();
+                const string Content = @"
+# Container action
+name: 'Hello World'
+description: 'Greet the world and record the time'
+author: 'GitHub'
+inputs:
+  greeting: # id of input
+    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
+    required: true
+    default: 'Hello'
+  entryPoint: # id of input
+    description: 'optional docker entrypoint overwrite.'
+    required: false
+outputs:
+  time: # id of output
+    description: 'The time we did the greeting'
+icon: 'hello.svg' # vector art to display in the GitHub Marketplace
+color: 'green' # optional, decorates the entry in the GitHub Marketplace
+runs:
+  using: 'node16'
+  main: 'task.js'
+";
+                Pipelines.ActionStep instance;
+                string directory;
+                CreateAction(yamlContent: Content, instance: out instance, directory: out directory);
+
+                // Act.
+                Definition definition = _actionManager.LoadAction(_ec.Object, instance);
+
+                // Assert.
+                Assert.NotNull(definition);
+                Assert.Equal(directory, definition.Directory);
+                Assert.NotNull(definition.Data);
+                Assert.NotNull(definition.Data.Inputs); // inputs
+                Dictionary<string, string> inputDefaults = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                foreach (var input in definition.Data.Inputs)
+                {
+                    var name = input.Key.AssertString("key").Value;
+                    var value = input.Value.AssertScalar("value").ToString();
+
+                    _hc.GetTrace().Info($"Default: {name} = {value}");
+                    inputDefaults[name] = value;
+                }
+
+                Assert.Equal(2, inputDefaults.Count);
+                Assert.True(inputDefaults.ContainsKey("greeting"));
+                Assert.Equal("Hello", inputDefaults["greeting"]);
+                Assert.True(string.IsNullOrEmpty(inputDefaults["entryPoint"]));
+                Assert.NotNull(definition.Data.Execution); // execution
+
+                Assert.NotNull(definition.Data.Execution as NodeJSActionExecutionData);
+                Assert.Equal("task.js", (definition.Data.Execution as NodeJSActionExecutionData).Script);
+                Assert.Equal("node16", (definition.Data.Execution as NodeJSActionExecutionData).NodeVersion);
            }
            finally
            {
--- a/src/Test/L0/Worker/ActionManifestManagerL0.cs
+++ b/src/Test/L0/Worker/ActionManifestManagerL0.cs
@@ -408,6 +408,50 @@ namespace GitHub.Runner.Common.Tests.Worker
                var nodeAction = result.Execution as NodeJSActionExecutionData;

                Assert.Equal("main.js", nodeAction.Script);
+                Assert.Equal("node12", nodeAction.NodeVersion);
+            }
+            finally
+            {
+                Teardown();
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void Load_Node16Action()
+        {
+            try
+            {
+                //Arrange
+                Setup();
+
+                var actionManifest = new ActionManifestManager();
+                actionManifest.Initialize(_hc);
+
+                //Act
+                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "node16action.yml"));
+
+                //Assert
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
+                Assert.Equal(1, result.Deprecated.Count);
+
+                Assert.True(result.Deprecated.ContainsKey("greeting"));
+                result.Deprecated.TryGetValue("greeting", out string value);
+                Assert.Equal("This property has been deprecated", value);
+
+                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);
+
+                var nodeAction = result.Execution as NodeJSActionExecutionData;
+
+                Assert.Equal("main.js", nodeAction.Script);
+                Assert.Equal("node16", nodeAction.NodeVersion);
            }
            finally
            {
@@ -626,6 +670,32 @@ namespace GitHub.Runner.Common.Tests.Worker
            {
                Teardown();
            }
+        }        
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void Load_ConditionalCompositeAction()
+        {
+            try
+            {
+                //Arrange
+                Setup();
+
+                var actionManifest = new ActionManifestManager();
+                actionManifest.Initialize(_hc);
+
+                //Act
+                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "conditional_composite_action.yml"));
+
+                //Assert
+                Assert.Equal("Conditional Composite", result.Name);
+                Assert.Equal(ActionExecutionType.Composite, result.Execution.ExecutionType);
+            }
+            finally
+            {
+                Teardown();
+            }
        }

        [Fact]
--- a/src/Test/L0/Worker/ExecutionContextL0.cs
+++ b/src/Test/L0/Worker/ExecutionContextL0.cs
@@ -193,9 +193,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                // Act.
                jobContext.InitializeJob(jobRequest, CancellationToken.None);

-                var action1 = jobContext.CreateChild(Guid.NewGuid(), "action_1", "action_1", null, null);
+                var action1 = jobContext.CreateChild(Guid.NewGuid(), "action_1", "action_1", null, null, 0);
                action1.IntraActionState["state"] = "1";
-                var action2 = jobContext.CreateChild(Guid.NewGuid(), "action_2", "action_2", null, null);
+                var action2 = jobContext.CreateChild(Guid.NewGuid(), "action_2", "action_2", null, null, 0);
                action2.IntraActionState["state"] = "2";


@@ -291,8 +291,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                // Act.
                jobContext.InitializeJob(jobRequest, CancellationToken.None);

-                var action1 = jobContext.CreateChild(Guid.NewGuid(), "action_1_pre", "action_1_pre", null, null);
-                var action2 = jobContext.CreateChild(Guid.NewGuid(), "action_1_main", "action_1_main", null, null);
+                var action1 = jobContext.CreateChild(Guid.NewGuid(), "action_1_pre", "action_1_pre", null, null, 0);
+                var action2 = jobContext.CreateChild(Guid.NewGuid(), "action_1_main", "action_1_main", null, null, 0);

                var actionId = Guid.NewGuid();
                var postRunner1 = hc.CreateService<IActionRunner>();
--- a/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs
+++ b/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs
@@ -105,6 +105,36 @@ namespace GitHub.Runner.Common.Tests.Worker.Expressions
            }
        }

+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        [InlineData(ActionResult.Failure, ActionResult.Failure, true)]
+        [InlineData(ActionResult.Failure, ActionResult.Success, false)]
+        [InlineData(ActionResult.Success, ActionResult.Failure, true)]
+        [InlineData(ActionResult.Success, ActionResult.Success, false)]
+        [InlineData(ActionResult.Success, null, false)]
+        public void FailureFunctionComposite(ActionResult jobStatus, ActionResult? actionStatus, bool expected)
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Arrange
+
+                var executionContext = InitializeExecutionContext(hc);
+                executionContext.Setup(x => x.GetGitHubContext("action_status")).Returns(actionStatus.ToString());
+                executionContext.Setup( x=> x.IsEmbedded).Returns(true);
+                executionContext.Setup( x=> x.Stage).Returns(ActionRunStage.Main);
+
+                _jobContext.Status = jobStatus;
+
+                // Act.
+                bool actual = Evaluate("failure()");
+
+                // Assert.
+                Assert.Equal(expected, actual);
+
+            }
+        }
+
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
@@ -134,12 +164,43 @@ namespace GitHub.Runner.Common.Tests.Worker.Expressions
            }
        }

+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        [InlineData(ActionResult.Failure, ActionResult.Failure, false)]
+        [InlineData(ActionResult.Failure, ActionResult.Success, true)]
+        [InlineData(ActionResult.Success, ActionResult.Failure, false)]
+        [InlineData(ActionResult.Success, ActionResult.Success, true)]
+        [InlineData(ActionResult.Success, null, true)]
+        public void SuccessFunctionComposite(ActionResult jobStatus, ActionResult? actionStatus, bool expected)
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Arrange
+
+                var executionContext = InitializeExecutionContext(hc);
+                executionContext.Setup(x => x.GetGitHubContext("action_status")).Returns(actionStatus.ToString());
+                executionContext.Setup( x=> x.IsEmbedded).Returns(true);
+                executionContext.Setup( x=> x.Stage).Returns(ActionRunStage.Main);
+
+                _jobContext.Status = jobStatus;
+
+                // Act.
+                bool actual = Evaluate("success()");
+
+                // Assert.
+                Assert.Equal(expected, actual);
+
+            }
+        }
+
        private TestHostContext CreateTestContext([CallerMemberName] String testName = "")
        {
            return new TestHostContext(this, testName);
        }

-        private void InitializeExecutionContext(TestHostContext hc)
+        private Mock<IExecutionContext> InitializeExecutionContext(TestHostContext hc)
        {
            _jobContext = new JobContext();

@@ -149,6 +210,8 @@ namespace GitHub.Runner.Common.Tests.Worker.Expressions

            _templateContext = new TemplateContext();
            _templateContext.State[nameof(IExecutionContext)] = executionContext.Object;
+
+            return executionContext;
        }

        private bool Evaluate(string expression)
--- a/src/Test/L0/Worker/JobExtensionL0.cs
+++ b/src/Test/L0/Worker/JobExtensionL0.cs
@@ -102,6 +102,7 @@ namespace GitHub.Runner.Common.Tests.Worker
            _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), steps, null, null, null, null);
            GitHubContext github = new GitHubContext();
            github["repository"] = new Pipelines.ContextData.StringContextData("actions/runner");
+            github["secret_source"] = new Pipelines.ContextData.StringContextData("Actions");
            _message.ContextData.Add("github", github);

            hc.SetSingleton(_actionManager.Object);
--- a/src/Test/L0/Worker/StepHostL0.cs
+++ b/src/Test/L0/Worker/StepHostL0.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+using GitHub.Runner.Worker;
+using GitHub.Runner.Worker.Handlers;
+using GitHub.Runner.Worker.Container;
+
+namespace GitHub.Runner.Common.Tests.Worker
+{
+    public sealed class StepHostL0
+    {
+        private Mock<IExecutionContext> _ec;
+        private Mock<IDockerCommandManager> _dc;
+        private TestHostContext CreateTestContext([CallerMemberName] String testName = "")
+        {
+            var hc = new TestHostContext(this, testName);
+
+            _ec = new Mock<IExecutionContext>();
+            _ec.SetupAllProperties();
+            _ec.Setup(x => x.Global).Returns(new GlobalContext { WriteDebug = true });
+            var trace = hc.GetTrace();
+            _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { trace.Info($"[{tag}]{message}"); });
+
+            _dc = new Mock<IDockerCommandManager>();
+            hc.SetSingleton(_dc.Object);
+            return hc;
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public async Task DetermineNodeRuntimeVersionInContainerAsync()
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Arrange.
+                var sh = new ContainerStepHost();
+                sh.Initialize(hc);
+                sh.Container = new ContainerInfo() { ContainerId = "1234abcd" };
+
+                _dc.Setup(d => d.DockerExec(_ec.Object, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<List<string>>()))
+                               .ReturnsAsync(0);
+
+                // Act.
+                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node12");
+
+                // Assert.
+                Assert.Equal("node12", nodeVersion);
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public async Task DetermineNodeRuntimeVersionInAlpineContainerAsync()
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Arrange.
+                var sh = new ContainerStepHost();
+                sh.Initialize(hc);
+                sh.Container = new ContainerInfo() { ContainerId = "1234abcd" };
+
+                _dc.Setup(d => d.DockerExec(_ec.Object, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<List<string>>()))
+                    .Callback((IExecutionContext ec, string id, string options, string command, List<string> output) =>
+                    {
+                        output.Add("alpine");
+                    })
+                    .ReturnsAsync(0);
+
+                // Act.
+                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node16");
+
+                // Assert.
+                Assert.Equal("node16_alpine", nodeVersion);
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public async Task DetermineNodeRuntimeVersionInUnknowContainerAsync()
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Arrange.
+                var sh = new ContainerStepHost();
+                sh.Initialize(hc);
+                sh.Container = new ContainerInfo() { ContainerId = "1234abcd" };
+
+                _dc.Setup(d => d.DockerExec(_ec.Object, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<List<string>>()))
+                    .Callback((IExecutionContext ec, string id, string options, string command, List<string> output) =>
+                    {
+                        output.Add("github");
+                    })
+                    .ReturnsAsync(0);
+
+                // Act.
+                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node16");
+
+                // Assert.
+                Assert.Equal("node16", nodeVersion);
+            }
+        }
+    }
+}
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -3,7 +3,6 @@
        <TargetFramework>netcoreapp3.1</TargetFramework>
        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-        <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
        <NoWarn>NU1701;NU1603;NU1603;xUnit2013;</NoWarn>
    </PropertyGroup>

--- a/src/Test/TestData/conditional_composite_action.yml
+++ b/src/Test/TestData/conditional_composite_action.yml
@@ -0,0 +1,49 @@
+
+name: 'Conditional Composite'
+description: 'Test composite run step conditionals'
+inputs:
+  exit-code:
+    description: 'Action fails if set to non-zero'
+    default: '0'
+outputs:
+  default:
+    description: "Did step run with default?"
+    value: ${{ steps.default-conditional.outputs.default }}
+  success:
+    description: "Did step run with success?"
+    value: ${{ steps.success-conditional.outputs.success }}
+  failure:
+    description: "Did step run with failure?"
+    value: ${{ steps.failure-conditional.outputs.failure }}
+  always:
+    description: "Did step run with always?"
+    value: ${{ steps.always-conditional.outputs.always }}
+
+runs:
+    using: "composite"
+    steps:
+      - run: exit ${{ inputs.exit-code }}
+        shell: bash
+
+      - run: echo "::set-output name=default::true"
+        id: default-conditional
+        shell: bash
+
+      - run: echo "::set-output name=success::true"
+        id: success-conditional
+        shell: bash
+        if: success()
+
+      - run: echo "::set-output name=failure::true"
+        id: failure-conditional
+        shell: bash
+        if: failure()
+
+      - run: echo "::set-output name=always::true"
+        id: always-conditional
+        shell: bash
+        if: always()
+
+      - run: echo "failed"
+        shell: bash
+        if: ${{ inputs.exit-code == 1 && failure() }}
--- a/src/Test/TestData/node16action.yml
+++ b/src/Test/TestData/node16action.yml
@@ -0,0 +1,20 @@
+name: 'Hello World'
+description: 'Greet the world and record the time'
+author: 'Test Corporation'
+inputs: 
+  greeting: # id of input
+    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
+    required: true
+    default: 'Hello'
+    deprecationMessage: 'This property has been deprecated'
+  entryPoint: # id of input
+    description: 'optional docker entrypoint overwrite.'
+    required: false
+outputs:
+  time: # id of output
+    description: 'The time we did the greeting'
+icon: 'hello.svg' # vector art to display in the GitHub Marketplace
+color: 'green' # optional, decorates the entry in the GitHub Marketplace
+runs:
+  using: 'node16'
+  main: 'main.js'
--- a/src/dir.proj
+++ b/src/dir.proj
@@ -2,10 +2,10 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" 
    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Target Name="GenerateConstant">
-        <!-- <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">
+        <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">
            <Output TaskParameter="ConsoleOutput" PropertyName="GitInfoCommitHash" />
-        </Exec> -->
-        <Message Text="Building $(Product): --- $(PackageRuntime)" Importance="high"/>
+        </Exec>
+        <Message Text="Building $(Product): $(GitInfoCommitHash) --- $(PackageRuntime)" Importance="high"/>

        <ItemGroup>
            <BuildConstants Include="namespace GitHub.Runner.Sdk"/>
@@ -14,7 +14,7 @@
            <BuildConstants Include="%20%20%20%20{"/>
            <BuildConstants Include="%20%20%20%20%20%20%20%20public static class Source"/>
            <BuildConstants Include="%20%20%20%20%20%20%20%20{"/>
-            <BuildConstants Include="%20%20%20%20%20%20%20%20%20%20%20%20public static readonly string CommitHash = %22dfcfae49e59b6dc3c2bb5295c649b33c4b49c964%22%3B"/>
+            <BuildConstants Include="%20%20%20%20%20%20%20%20%20%20%20%20public static readonly string CommitHash = %22$(GitInfoCommitHash)%22%3B"/>
            <BuildConstants Include="%20%20%20%20%20%20%20%20}%0A"/>
            <BuildConstants Include="%20%20%20%20%20%20%20%20public static class RunnerPackage"/>
            <BuildConstants Include="%20%20%20%20%20%20%20%20{"/>
@@ -27,6 +27,7 @@

        <WriteLinesToFile File="Runner.Sdk/BuildConstants.cs" Lines="@(BuildConstants)" Overwrite="true" />

+        <Exec Command="git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs" ConsoleToMSBuild="true" />
    </Target>

    <ItemGroup>
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.283.3
+2.285.3
Author	SHA1	Message	Date
Ferenc Hammerl	27b5dd9a40	Fix Monterey incompat `45decac397`	2023-01-30 20:07:46 +00:00
Ferenc Hammerl	2f5110be73	Use dotnet 3.1 compat syntax	2023-01-30 19:45:27 +00:00
Ferenc Hammerl	1cb1fc55d9	Update releaseVersion	2023-01-30 17:01:26 +01:00
Ferenc Hammerl	9b6fcc8e1d	M285/backport 5852 (#2403 ) * set env in ProcessInvoker sanitized (#2280) * set env in ProcessInvoker sanitized * Update runnerversion and rel notes --------- Co-authored-by: Stefan Ruvceski <96768603+ruvceskistefan@users.noreply.github.com>	2023-01-30 16:58:47 +01:00
Thomas Boop	7f6b9e55d6	Update releaseVersion	2022-09-20 14:22:36 -04:00
Thomas Boop	7046439877	fix workflows (#2144 )	2022-09-20 14:02:27 -04:00
Thomas Boop	b7fff90e29	M285 Hotfix for container escaping (#2137 ) * Fix escaping of docker envs backport * create as prerelease * 2.285.2 release notes Co-authored-by: Nikola Jokic <97525037+nikola-jokic@users.noreply.github.com>	2022-09-20 12:53:30 -04:00
eric sciple	50afba61b4	release 2.285.1	2021-12-06 10:54:57 -06:00
eric sciple	66ee648c13	bump patch version	2021-12-06 10:54:09 -06:00
eric sciple	16e83b0e84	revert node12 version due to fs.copyFileSync hang https://github.com/actions/runner/issues/1536 (#1537 )	2021-12-06 10:46:46 -06:00
Ferenc Hammerl	c75a77df66	Update releaseVersion	2021-11-29 17:22:57 +01:00
Ferenc Hammerl	6332f9a42f	Prepare for runner 2.285.0 release (#1520 )	2021-11-29 16:07:56 +00:00
Tingluo Huang	5b8ff174c6	Add telemetry around runner update process. (#1497 ) * Add telemetry around runner update process. * . * . * .	2021-11-22 18:27:57 -05:00
Tingluo Huang	e3e977fd84	Support node.js 16 and bump node.js 12 version. (#1439 ) * Support node.js 16 and bump node.js 12 version. * L0	2021-11-18 15:25:33 -05:00
Ferenc Hammerl	4dc8a09db3	Only execute post for actions that have one (#1481 ) * Only execute post for actions that have one * Revert haspost check * Remove launch commit * Remove comment * Restore whitespace * Restore wspace	2021-11-18 17:56:13 +01:00
Laura Yu	dcc5d34ad1	Add secret source to start job step (#1411 ) * Add secret source to start job step WIP * Update to use GetGitHubContext to grab source info * Update JobExtensionL0.cs * Update JobExtension.cs * Update JobExtension.cs	2021-11-17 17:09:38 -05:00
eric sciple	3e34fb10c1	improve telemetry to better diagnose runner configuration issues (#1487 )	2021-11-15 13:42:57 -06:00
Tingluo Huang	23a693aa2c	Update README.md	2021-11-09 14:19:46 -05:00
Tingluo Huang	eb36db8ff9	Try to delete `portable-net45+win8` from all projects (#1470 ) * Update Runner.Common.csproj * Update Runner.Listener.csproj * Update Runner.PluginHost.csproj * Update Runner.Plugins.csproj * Update Runner.Sdk.csproj * Update Runner.Worker.csproj * Update Sdk.csproj * Update Test.csproj	2021-11-09 10:53:53 -05:00
Julio Barba	85e1927754	Prepare for runner 2.284.0 release (#1448 )	2021-11-01 11:16:21 -04:00
Julio Barba	b6dbf42746	Improve retry handling based on feedback (#1447 )	2021-10-29 16:04:34 -04:00
Ferenc Hammerl	67ba8a7d42	Support Conditional Steps in Composite Actions (#1438 ) * conditional support for composite actions * Fix Conditional function evaluation * Push launch.json temporarily * Revert "Push launch.json temporarily" * rename context * Cleanup comments * fix success/failure functions to run based on pre/main steps * idea of step_status * change to use steps context, WIP * add inputs to possible if condition expressions * use action_status * pr cleanup * Added right stages * Test on stage in conditional functions * Fix naming and formatting * Fix tests * Add success and failure L0s * Remove comment * Remove whitespace * Undo formatting * Add L0 for step-if parsing * Add ADR Co-authored-by: Thomas Boop <thboop@github.com>	2021-10-29 15:45:42 +02:00
Ferenc Hammerl	e4f9e6ae26	Log current runner version in terminal (#1441 )	2021-10-29 14:23:26 +02:00
Thomas Boop	854d5e3bf3	Fix an issue where nested local composite actions did not correctly register post steps (#1433 ) * Always register post steps for local actions * Register post steps along with their conditions * remove debug code Co-authored-by: Ferenc Hammerl <fhammerl@github.com>	2021-10-27 15:31:58 +02:00
Thomas Boop	57dec28f68	Cleanup Older versions on MacOS now that we recreate node versions as needed (#1410 ) * Cleanup old version update code * fix template * fix indents	2021-10-19 10:15:37 -04:00
Tingluo Huang	55a861f089	Expose GITHUB_REF_* as environment variable (#1314 ) * Keep env vars alphabetical * ref_* context. Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>	2021-10-18 22:22:34 -04:00
jeremyd2019	51b2031cbf	Add arch to runner context (#1372 ) Fixes #1185	2021-10-13 23:49:26 -04:00
				`@@ -1 +0,0 @@`
				To update kubeInnerHandler under `Misc/layoutbin` run `npm install && npm run all`
				`@@ -1 +0,0 @@`
				To update kubectlHandler under `Misc/layoutbin` run `npm install && npm run all`
				`@@ -1 +0,0 @@`
				To update podmanHandler under `Misc/layoutbin` run `npm install && npm run all`
@@ -1 +1 @@
 .283.3
 .285.3