Merge branch 'main' into hidden-docs-alt

2020-11-03 20:11:41 -05:00 · 2020-11-03 20:11:41 -05:00 · 089e99b96c
--- 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

--- 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")
-            }
-          }
-        }
      }
    }
  }
+}
 }
  ```

--- 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: {
--- 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",
--- 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",