Merge branch 'fhammerl/tag-releases' of https://github.com/actions/toolkit into fhammerl/tag-releases

Delete test yaml
Fix release typo
2023-03-07 13:21:36 +00:00 · 2023-03-07 13:20:42 +00:00 · 2023-03-07 13:20:42 +00:00 · 2023-03-07 13:20:42 +00:00 · 2023-03-07 13:20:42 +00:00 · 2023-03-07 13:20:42 +00:00
20 changed files with 421 additions and 34 deletions
@@ -9,11 +9,17 @@ on:

 jobs:
  test:
+    outputs:
+      sha: ${{ steps.commit.outputs.sha }}
+      tag: ${{ steps.tag.outputs.tag }}
    runs-on: macos-latest
-
    steps:
      - name: setup repo
        uses: actions/checkout@v3
+      - id: commit
+        run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+      - id: tag
+        run: echo "tag=@actions/${{ github.event.inputs.package }}@$(cat packages/${{ github.event.inputs.package }}/package.json | jq -r .version)" >> "$GITHUB_OUTPUT"

      - name: verify package exists
        run: ls packages/${{ github.event.inputs.package }}
@@ -77,4 +83,26 @@ jobs:
          curl -X POST -H 'Content-type: application/json' --data '{"text":":dance: Successfully published a new version of ${{ github.event.inputs.package }}"}' $SLACK_WEBHOOK
        env:
          SLACK_WEBHOOK: ${{ secrets.SLACK }}
+  tag:
+    name: "Tag ${{ needs.test.outputs.sha }} with ${{ needs.test.outputs.tag }}"
+    runs-on: "macos-latest"
+    needs: [test, publish]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Create tag
+      uses: actions/github-script@v6
+      with:
+        script: |
+          github.rest.git.createRef({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            ref: 'refs/tags/${{ needs.test.outputs.tag }}',
+            sha: '${{ needs.test.outputs.sha }}'
+          })
+    - name: notify slack on failure
+      if: failure()
+      run: |
+        curl -X POST -H 'Content-type: application/json' --data '{"text":":pb__failed: Publish of ${{ github.event.inputs.package }} was successful, but failed to tag commit ${{ needs.test.outputs.sha }} with version ${{ needs.test.outputs.tag }}"}' $SLACK_WEBHOOK
+      env:
+        SLACK_WEBHOOK: ${{ secrets.SLACK }}

@@ -29852,4 +29852,4 @@
      "dev": true
    }
  }
-}
+}
@@ -29,4 +29,4 @@
    "ts-jest": "^27.0.5",
    "typescript": "^3.9.9"
  }
-}
+}
@@ -9,6 +9,8 @@
      "version": "1.1.1",
      "license": "MIT",
      "dependencies": {
+        "@actions/core": "^1.9.1",
+        "@actions/http-client": "^2.0.1",
        "tmp": "^0.2.1",
        "tmp-promise": "^3.0.2"
      },
@@ -17,6 +19,23 @@
        "typescript": "^3.8.3"
      }
    },
+    "node_modules/@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "node_modules/@types/tmp": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
@@ -140,6 +159,14 @@
        "tmp": "^0.2.0"
      }
    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
    "node_modules/typescript": {
      "version": "3.9.10",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
@@ -153,6 +180,14 @@
        "node": ">=4.2.0"
      }
    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -160,6 +195,23 @@
    }
  },
  "dependencies": {
+    "@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "@types/tmp": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
@@ -262,12 +314,22 @@
        "tmp": "^0.2.0"
      }
    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
    "typescript": {
      "version": "3.9.10",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
      "dev": true
    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -114,4 +114,7 @@
 - Fix issue with symlink restoration on windows.

 ### 3.1.3
- Fix to prevent from setting MYSYS environement variable globally [#1329](https://github.com/actions/toolkit/pull/1329).
+- Fix to prevent from setting MYSYS environement variable globally [#1329](https://github.com/actions/toolkit/pull/1329).
+
+### 3.1.4
+- Fix zstd not being used due to `zstd --version` output change in zstd 1.5.4 release. See [#1353](https://github.com/actions/toolkit/pull/1353).
@@ -1,15 +1,19 @@
 {
  "name": "@actions/cache",
-  "version": "3.1.3",
+  "version": "3.1.4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@actions/cache",
-      "version": "3.1.3",
+      "version": "3.1.4",
      "license": "MIT",
      "dependencies": {
+        "@actions/core": "^1.10.0",
+        "@actions/exec": "^1.0.1",
        "@actions/glob": "^0.1.0",
+        "@actions/http-client": "^2.0.1",
+        "@actions/io": "^1.0.1",
        "@azure/abort-controller": "^1.1.0",
        "@azure/ms-rest-js": "^2.6.0",
        "@azure/storage-blob": "^12.8.0",
@@ -39,6 +43,14 @@
        "uuid": "dist/bin/uuid"
      }
    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
    "node_modules/@actions/glob": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.1.0.tgz",
@@ -56,6 +68,11 @@
        "tunnel": "^0.0.6"
      }
    },
+    "node_modules/@actions/io": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
+      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+    },
    "node_modules/@azure/abort-controller": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
@@ -616,6 +633,14 @@
        }
      }
    },
+    "@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "requires": {
+        "@actions/io": "^1.0.1"
+      }
+    },
    "@actions/glob": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.1.0.tgz",
@@ -633,6 +658,11 @@
        "tunnel": "^0.0.6"
      }
    },
+    "@actions/io": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
+      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+    },
    "@azure/abort-controller": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
@@ -1,6 +1,6 @@
 {
  "name": "@actions/cache",
-  "version": "3.1.3",
+  "version": "3.1.4",
  "preview": true,
  "description": "Actions cache lib",
  "keywords": [
@@ -71,11 +71,15 @@ export async function unlinkFile(filePath: fs.PathLike): Promise<void> {
  return util.promisify(fs.unlink)(filePath)
 }

-async function getVersion(app: string): Promise<string> {
-  core.debug(`Checking ${app} --version`)
+async function getVersion(
+  app: string,
+  additionalArgs: string[] = []
+): Promise<string> {
  let versionOutput = ''
+  additionalArgs.push('--version')
+  core.debug(`Checking ${app} ${additionalArgs.join(' ')}`)
  try {
-    await exec.exec(`${app} --version`, [], {
+    await exec.exec(`${app}`, additionalArgs, {
      ignoreReturnCode: true,
      silent: true,
      listeners: {
@@ -94,18 +98,14 @@ async function getVersion(app: string): Promise<string> {

 // Use zstandard if possible to maximize cache performance
 export async function getCompressionMethod(): Promise<CompressionMethod> {
-  const versionOutput = await getVersion('zstd')
+  const versionOutput = await getVersion('zstd', ['--quiet'])
  const version = semver.clean(versionOutput)
+  core.debug(`zstd version: ${version}`)

-  if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
-    // zstd is not installed
+  if (versionOutput === '') {
    return CompressionMethod.Gzip
-  } else if (!version || semver.lt(version, 'v1.3.2')) {
-    // zstd is installed but using a version earlier than v1.3.2
-    // v1.3.2 is required to use the `--long` options in zstd
-    return CompressionMethod.ZstdWithoutLong
  } else {
-    return CompressionMethod.Zstd
+    return CompressionMethod.ZstdWithoutLong
  }
 }

@@ -9,6 +9,7 @@
      "version": "1.10.0",
      "license": "MIT",
      "dependencies": {
+        "@actions/http-client": "^2.0.1",
        "uuid": "^8.3.2"
      },
      "devDependencies": {
@@ -16,6 +17,14 @@
        "@types/uuid": "^8.3.4"
      }
    },
+    "node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "node_modules/@types/node": {
      "version": "12.0.2",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
@@ -28,6 +37,14 @@
      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
      "dev": true
    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
    "node_modules/uuid": {
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -38,6 +55,14 @@
    }
  },
  "dependencies": {
+    "@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "@types/node": {
      "version": "12.0.2",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
@@ -50,6 +75,11 @@
      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
      "dev": true
    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
    "uuid": {
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -9,6 +9,7 @@
      "version": "5.1.1",
      "license": "MIT",
      "dependencies": {
+        "@actions/http-client": "^2.0.1",
        "@octokit/core": "^3.6.0",
        "@octokit/plugin-paginate-rest": "^2.17.0",
        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
@@ -17,6 +18,14 @@
        "proxy": "^1.0.2"
      }
    },
+    "node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "node_modules/@octokit/auth-token": {
      "version": "2.4.5",
      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
@@ -331,6 +340,14 @@
        "proxy": "bin/proxy.js"
      }
    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
    "node_modules/universal-user-agent": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
@@ -343,6 +360,14 @@
    }
  },
  "dependencies": {
+    "@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "@octokit/auth-token": {
      "version": "2.4.5",
      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
@@ -610,6 +635,11 @@
        "debug": "^4.1.1"
      }
    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
    "universal-user-agent": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
@@ -6,12 +6,30 @@
  "packages": {
    "": {
      "name": "@actions/glob",
-      "version": "0.4.0",
+      "version": "0.3.0",
      "license": "MIT",
      "dependencies": {
+        "@actions/core": "^1.9.1",
        "minimatch": "^3.0.4"
      }
    },
+    "node_modules/@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "node_modules/balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -41,9 +59,42 @@
      "engines": {
        "node": "*"
      }
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
    }
  },
  "dependencies": {
+    "@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -70,6 +121,16 @@
      "requires": {
        "brace-expansion": "^1.1.7"
      }
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
    }
  }
 }
@@ -1,5 +1,9 @@
 ## Releases

+## 2.1.0
+- Add support for `*` and subdomains in `no_proxy` [#1355](https://github.com/actions/toolkit/pull/1355) [#1223](https://github.com/actions/toolkit/pull/1223)
+- Bypass proxy for loopback IP adresses [#1360](https://github.com/actions/toolkit/pull/1360))
+
 ## 2.0.1
 - Fix an issue with missing `tunnel` dependency [#1085](https://github.com/actions/toolkit/pull/1085)

@@ -176,11 +176,16 @@ describe('proxy', () => {
    expect(bypass).toBeTruthy()
  })

-  // Do not match wildcard ("*") as per https://github.com/actions/runner/blob/97195bad5870e2ad0915ebfef1616083aacf5818/docs/adrs/0263-proxy-support.md
  it('checkBypass returns true if no_proxy is "*"', () => {
    process.env['no_proxy'] = '*'
    const bypass = pm.checkBypass(new URL('https://anything.whatsoever.com'))
-    expect(bypass).toBeFalsy()
+    expect(bypass).toBeTruthy()
+  })
+
+  it('checkBypass returns true if no_proxy contains comma separated "*"', () => {
+    process.env['no_proxy'] = 'domain.com,* , example.com'
+    const bypass = pm.checkBypass(new URL('https://anything.whatsoever.com'))
+    expect(bypass).toBeTruthy()
  })

  it('HttpClient does basic http get request through proxy', async () => {
@@ -237,6 +242,31 @@ describe('proxy', () => {
    expect(_proxyConnects).toHaveLength(0)
  })

+  it('HttpClient bypasses proxy for loopback addresses (localhost, ::1, 127.*)', async () => {
+    // setup a server listening on localhost:8091
+    const server = http.createServer((request, response) => {
+      response.writeHead(200)
+      request.pipe(response)
+    })
+    server.listen(8091)
+    try {
+      process.env['http_proxy'] = _proxyUrl
+      const httpClient = new httpm.HttpClient()
+      let res = await httpClient.get('http://localhost:8091')
+      expect(res.message.statusCode).toBe(200)
+      res = await httpClient.get('http://127.0.0.1:8091')
+      expect(res.message.statusCode).toBe(200)
+
+      // no support for ipv6 for now
+      expect(httpClient.get('http://[::1]:8091')).rejects.toThrow()
+
+      // proxy at _proxyUrl was ignored
+      expect(_proxyConnects).toEqual([])
+    } finally {
+      server.close()
+    }
+  })
+
  it('proxyAuth not set in tunnel agent when authentication is not provided', async () => {
    process.env['https_proxy'] = 'http://127.0.0.1:8080'
    const httpClient = new httpm.HttpClient()
@@ -1,6 +1,6 @@
 {
  "name": "@actions/http-client",
-  "version": "2.0.1",
+  "version": "2.1.0",
  "description": "Actions Http Client",
  "keywords": [
    "github",
@@ -25,6 +25,11 @@ export function checkBypass(reqUrl: URL): boolean {
    return false
  }

+  const reqHost = reqUrl.hostname
+  if (isLoopbackAddress(reqHost)) {
+    return true
+  }
+
  const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || ''
  if (!noProxy) {
    return false
@@ -52,6 +57,7 @@ export function checkBypass(reqUrl: URL): boolean {
    .map(x => x.trim().toUpperCase())
    .filter(x => x)) {
    if (
+      upperNoProxyItem === '*' ||
      upperReqHosts.some(
        x =>
          x === upperNoProxyItem ||
@@ -66,3 +72,13 @@ export function checkBypass(reqUrl: URL): boolean {

  return false
 }
+
+function isLoopbackAddress(host: string): boolean {
+  const hostLower = host.toLowerCase()
+  return (
+    hostLower === 'localhost' ||
+    hostLower.startsWith('127.') ||
+    hostLower.startsWith('[::1]') ||
+    hostLower.startsWith('[0:0:0:0:0:0:0:1]')
+  )
+}
@@ -1,7 +1,5 @@
 # @actions/io Releases

-### 1.1.3
- [Fixed a security bug where we used child_proccess.exec instead of execFile for windows](https://github.com/actions/toolkit/pull/1255)
 ### 1.1.2
 - Update `lockfileVersion` to `v2` in `package-lock.json [#1020](https://github.com/actions/toolkit/pull/1020) 

@@ -1,13 +1,13 @@
 {
  "name": "@actions/io",
-  "version": "1.1.3",
+  "version": "1.1.2",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@actions/io",
-      "version": "1.1.3",
+      "version": "1.1.2",
      "license": "MIT"
    }
  }
-}
+}
@@ -1,6 +1,6 @@
 {
  "name": "@actions/io",
-  "version": "1.1.3",
+  "version": "1.1.2",
  "description": "Actions io lib",
  "keywords": [
    "github",
@@ -34,4 +34,4 @@
  "bugs": {
    "url": "https://github.com/actions/toolkit/issues"
  }
-}
+}
@@ -4,6 +4,7 @@ import * as path from 'path'
 import {promisify} from 'util'
 import * as ioUtil from './io-util'

+const exec = promisify(childProcess.exec)
 const execFile = promisify(childProcess.execFile)

 /**
@@ -126,13 +127,15 @@ export async function rmRF(inputPath: string): Promise<void> {
      )
    }
    try {
-      // const cmdPath = ioUtil.getCmdPath()
-      const cmdArgs = ['/s', '/q', `${inputPath}`]
+      const cmdPath = ioUtil.getCmdPath()
      if (await ioUtil.isDirectory(inputPath, true)) {
-        await execFile('rd', cmdArgs)
+        await exec(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, {
+          env: {inputPath}
+        })
      } else {
-        const cmdArgsDel = ['/f', '/a', `${inputPath}`]
-        await execFile('del', cmdArgsDel)
+        await exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
+          env: {inputPath}
+        })
      }
    } catch (err) {
      // if you try to delete a file that doesn't exist, desired result is achieved
@@ -9,6 +9,10 @@
      "version": "2.0.1",
      "license": "MIT",
      "dependencies": {
+        "@actions/core": "^1.2.6",
+        "@actions/exec": "^1.0.0",
+        "@actions/http-client": "^2.0.1",
+        "@actions/io": "^1.1.1",
        "semver": "^6.1.0",
        "uuid": "^3.3.2"
      },
@@ -19,6 +23,44 @@
        "nock": "^13.2.9"
      }
    },
+    "node_modules/@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/core/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "node_modules/@actions/io": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
+      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+    },
    "node_modules/@types/nock": {
      "version": "11.1.0",
      "resolved": "https://registry.npmjs.org/@types/nock/-/nock-11.1.0.tgz",
@@ -110,6 +152,14 @@
        "semver": "bin/semver.js"
      }
    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
    "node_modules/uuid": {
      "version": "3.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
@@ -121,6 +171,43 @@
    }
  },
  "dependencies": {
+    "@actions/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+        }
+      }
+    },
+    "@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "requires": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "@actions/io": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
+      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+    },
    "@types/nock": {
      "version": "11.1.0",
      "resolved": "https://registry.npmjs.org/@types/nock/-/nock-11.1.0.tgz",
@@ -201,6 +288,11 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
    "uuid": {
      "version": "3.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
Author	SHA1	Message	Date
Ferenc Hammerl	5a16fe72bf	Merge branch 'fhammerl/tag-releases' of https://github.com/actions/toolkit into fhammerl/tag-releases	2023-03-07 13:21:36 +00:00
Ferenc Hammerl	88d5c3d103	Delete test yaml	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	7c38e6fc88	Fix release typo	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	f7c54864a4	Raw jq for actual version	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	2159b716f6	BEtter tag format	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	d32efbf702	Fix indentation	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	084bcce189	Use constants and push for tag-test Fix typo in releases.yml	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	301e5cd5de	Fix indent	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	3645c84be9	Fix typo	2023-03-07 13:20:42 +00:00
Ferenc Hammerl	9d7fee4ab4	Tag commits on NPM releases with pkgname-v.x.y.z	2023-03-07 13:20:41 +00:00
Ferenc Hammerl	95edd3418c	Delete test yaml	2023-03-07 11:18:28 +00:00
Ferenc Hammerl	4419cadd68	Fix release typo	2023-03-07 11:18:17 +00:00
Ferenc Hammerl	0d44da2b87	Raw jq for actual version Tag test / publish (push) Has been cancelled Details Tag test / test (push) Has been cancelled Details Tag test / Tag ${{ needs.test.outputs.sha }} with ${{ needs.test.outputs.tag }} (push) Has been cancelled Details	2023-03-07 11:11:44 +00:00
Ferenc Hammerl	cb86beb23a	BEtter tag format	2023-03-07 11:05:52 +00:00
Ferenc Hammerl	7edb0957cc	Fix indentation	2023-03-07 10:51:42 +00:00
Ferenc Hammerl	b92588fa7f	Use constants and push for tag-test Fix typo in releases.yml	2023-03-07 10:49:25 +00:00
Ferenc Hammerl	39e91a437a	Fix indent	2023-03-07 10:44:40 +00:00
Ferenc Hammerl	4166af5b3e	Fix typo	2023-03-07 10:43:17 +00:00
Ferenc Hammerl	b8bef557c0	Tag commits on NPM releases with pkgname-v.x.y.z	2023-03-07 10:41:27 +00:00
Ferenc Hammerl	787b2cf270	Bump http-client to version 2.1.0 (#1364 ) * Update package.json * Update package.json * Update RELEASES.md	2023-03-06 17:03:09 +01:00
Ferenc Hammerl	94ab8de5f3	Bypass proxy on loopback IPs (localhost, 127., ::1 etc) (#1361 ) Bypass proxy on loopback IPs * Expect empty array instead of undefined * Restore accidentally deleted test * Fix formatting * Fix linting * Update proxy.ts * Better ipv6 definitions * Fix linting * Update proxy.test.ts	2023-03-06 11:07:04 +01:00
Ferenc Hammerl	d47e0bac60	Support '*' wildcard (#1355 )	2023-03-06 11:02:29 +01:00
Ferenc Hammerl	1f4b3fac06	Revert "Bypass proxy on loopback IPs" This reverts commit `8d92c9c903`.	2023-03-01 13:48:44 +00:00
Ferenc Hammerl	8d92c9c903	Bypass proxy on loopback IPs	2023-03-01 13:45:12 +00:00
Lovepreet Singh	0db3029fcf	Merge pull request #1353 from actions/pdotl/zstd-version-fix Hotfix Zstd breaking due to version change in runners	2023-02-21 00:50:51 +05:30
Lovepreet Singh	e6e29846f2	Add debug statement for exact zstd version value and remove dependence on version for now	2023-02-20 19:13:38 +00:00
Lovepreet Singh	7c15bf6f40	Fix failing windows test	2023-02-20 18:50:26 +00:00
Lovepreet Singh	bc713ab90d	Add release info	2023-02-20 18:38:47 +00:00
Lovepreet Singh	a9d266bb7c	Fix lint issues	2023-02-20 15:26:04 +00:00
Lovepreet Singh	cf3dd065b8	Add default value and rename args	2023-02-20 14:59:12 +00:00
Lovepreet Singh	6ec51745ad	Update debug statement to include latest command	2023-02-20 14:23:53 +00:00
Lovepreet Singh	0f91c9c203	Bump version using npm	2023-02-20 13:53:17 +00:00
Lovepreet Singh	e18b2d8a33	0.0.1	2023-02-20 13:43:31 +00:00
Lovepreet Singh	4fd425926c	Fix version number	2023-02-20 13:43:24 +00:00
Lovepreet Singh	83dffb7746	Fix lint issues	2023-02-20 13:33:16 +00:00
Lovepreet Singh	1d1d5456e3	Removed code that checks for version less than 1.3.2 as it was not working. Defaulting to zstd without long as that is what is always happening currently.	2023-02-20 13:27:45 +00:00
Lovepreet Singh	9e06993ffc	Hotfix zstd version change only	2023-02-20 13:08:22 +00:00
Lovepreet Singh	3630ea6eed	Fix bug with version shortcircuiting because of version being null	2023-02-20 12:51:49 +00:00
Lovepreet Singh	c2d3089f83	bump version	2023-02-20 10:32:34 +00:00
Lovepreet Singh	652109d32c	Test passing quiet as argument	2023-02-20 10:30:41 +00:00
Lovepreet Singh	f2aa430c9d	Add debug statements	2023-02-20 10:05:34 +00:00