From 1ace92ac6f4fe0d1798fb087adf66b98b97d6dde Mon Sep 17 00:00:00 2001 From: ajs256 <67526318+ajs256@users.noreply.github.com> Date: Mon, 2 Nov 2020 07:31:09 -0800 Subject: [PATCH 1/4] Remove reference to AllContributors The AllContributors bot has been removed, but there was still a reference in CONTRIBUTING.md. I updated that line and changed the link to the contributor charts. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eca9d11723..ddd5078e3b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ When you're done making changes and you'd like to propose them for review, use t ### Your PR is merged! Congratulations! The whole GitHub community thanks you. :sparkles: -Once your PR is merged, you can be added as a contributor in the [readme](README.md#contributors-). +Once your PR is merged, you will be proudly listed as a contributor in the [contributor chart](https://github.com/github/docs/graphs/contributors). ### Keep contributing as you use GitHub Docs From d9d5aa50d24dd7ac34905f97aba4578c66e97ef5 Mon Sep 17 00:00:00 2001 From: Arthur Casals Date: Tue, 3 Nov 2020 21:47:53 +0100 Subject: [PATCH 2/4] Update migrating-from-jenkins-to-github-actions.md (#493) Fixes #395 --- ...igrating-from-jenkins-to-github-actions.md | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md b/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md index d7c662b90d..28a1e556e0 100644 --- a/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md +++ b/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md @@ -232,12 +232,19 @@ Jenkins Pipeline ```yaml pipeline { - agent none - stages { - stage('Run Tests') { - parallel { - stage('Test On MacOS') { - agent { label "macos" } +agent none +stages { + stage('Run Tests') { + matrix { + axes { + axis { + name: 'PLATFORM' + values: 'macos', 'linux' + } + } + agent { label "${PLATFORM}" } + stages { + stage('test') { tools { nodejs "node-12" } steps { dir("scripts/myapp") { @@ -246,19 +253,10 @@ pipeline { } } } - stage('Test On Linux') { - agent { label "linux" } - tools { nodejs "node-12" } - steps { - dir("script/myapp") { - sh(script: "npm install -g bats") - sh(script: "bats tests") - } - } - } } } } +} } ``` From 85c52d47e5fea5009d5cd0ae981e8cf79f377386 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Tue, 3 Nov 2020 14:21:12 -0800 Subject: [PATCH 3/4] Don't record 304 redirects (#16245) --- middleware/record-redirect.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleware/record-redirect.js b/middleware/record-redirect.js index 564f0d37d6..b72e975db3 100644 --- a/middleware/record-redirect.js +++ b/middleware/record-redirect.js @@ -1,11 +1,11 @@ const { v4: uuidv4 } = require('uuid') -const { inRange } = require('lodash') module.exports = function (req, res, next) { if (!req.hydro.maySend()) return next() res.on('finish', async function recordRedirect () { - if (!inRange(res.statusCode, 300, 400)) return + // We definitely don't want 304 + if (![301, 302, 303, 307, 308].includes(res.statusCode)) return const schemaName = req.hydro.schemas.redirect const redirectEvent = { context: { From a7b33b6449582b3756f2b4a9c521fc770395672e Mon Sep 17 00:00:00 2001 From: Martin Lopes <54248166+martin389@users.noreply.github.com> Date: Wed, 4 Nov 2020 09:54:57 +1000 Subject: [PATCH 4/4] Adds API note about Search query behaviour (#16300) Co-authored-by: Sarah Edwards --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52465f8d7c..948120da18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,9 +1156,9 @@ } }, "@github/rest-api-operations": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.3.0.tgz", - "integrity": "sha512-TmiEZNSMnV6zCsfe4T+Pzz2XKK06acMpDg9lv3/nOYB/Iz7euUGVIaTb6zhOTjRHqRTEg4ZwRON7ghzSTd7rfA==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@github/rest-api-operations/-/rest-api-operations-3.3.1.tgz", + "integrity": "sha512-nMI4eVLphWta2E/7pvFjdTwn4wAJROqCJBLXKuaaWGG0HREFTV+tD26nEV9w8dJBu1kIFYNsANFC8nrI8HYOwA==" }, "@hapi/address": { "version": "2.1.4", @@ -3169,7 +3169,7 @@ }, "agentkeepalive": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz", "integrity": "sha1-xdG9SxKQCPEWPyNvhuX66iAm4u8=" }, "aggregate-error": { @@ -3329,7 +3329,7 @@ "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { "sprintf-js": "~1.0.2" } @@ -4114,7 +4114,7 @@ }, "brfs": { "version": "1.6.1", - "resolved": "http://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", + "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==", "requires": { "quote-stream": "^1.0.1", @@ -4193,7 +4193,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "requires": { "buffer-xor": "^1.0.3", @@ -4227,7 +4227,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { "bn.js": "^4.1.0", @@ -5645,7 +5645,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "requires": { "cipher-base": "^1.0.1", @@ -5657,7 +5657,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "requires": { "cipher-base": "^1.0.3", @@ -6384,7 +6384,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "requires": { "bn.js": "^4.1.0", @@ -6824,7 +6824,7 @@ "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { "is-arrayish": "^0.2.1" @@ -9962,7 +9962,7 @@ "dependencies": { "mkdirp": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" }, "nopt": { @@ -15143,7 +15143,7 @@ }, "magic-string": { "version": "0.22.5", - "resolved": "http://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", "requires": { "vlq": "^0.2.2" @@ -18704,7 +18704,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "requires": { "inherits": "^2.0.1", diff --git a/package.json b/package.json index 553b217821..6a1c959a34 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@github-docs/data-directory": "^1.2.0", "@github-docs/frontmatter": "^1.3.1", "@github-docs/render-content": "^5.2.0", - "@github/rest-api-operations": "^3.3.0", + "@github/rest-api-operations": "^3.3.1", "@octokit/rest": "^16.38.1", "@primer/css": "^15.1.0", "@primer/octicons": "^11.0.0",