Merge branch 'main' into 3488-dependabot-ecosystem-version

Author: mchammer01

.github/allowed-actions.js

@@ -12,7 +12,7 @@ module.exports = [
   'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526', //actions/setup-ruby@v1.1.2
   'actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4', //actions/stale@v3.0.13
   'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
-  'crykn/copy_folder_to_another_repo_action@abc264e1c16eb3d7b1f7763bfdb0e1699ad43120',
+  'crykn/copy_folder_to_another_repo_action@0282e8b9fef06de92ddcae9fe6cb44df6226646c',
   'cschleiden/actions-linter@43fd4e08e52ed40c0e2782dc2425694388851576',
   'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911',
   'docker://chinthakagodawita/autoupdate-action:v1',

.github/workflows/link-check-dotcom.yml

@@ -0,0 +1,57 @@
+name: 'Link Checker: Dotcom'
+
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  see_if_should_skip:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
+        with:
+          cancel_others: 'false'
+          github_token: ${{ github.token }}
+          paths: '[".github/workflows/link-check-dotcom.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
+  build:
+    needs: see_if_should_skip
+    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    steps:
+      # Each of these ifs needs to be repeated at each step to make sure the required check still runs
+      # Even if if doesn't do anything
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Checkout
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Setup node
+        uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
+        with:
+          node-version: 14.x
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Install
+        run: npm ci
+
+      ## TODO
+      # - if: ${{ github.repository == 'github/docs-internal' &&  needs.see_if_should_skip.outputs.should_skip != 'true' }}
+      #   name: Clone early access
+      #   run: npm run heroku-postbuild
+      #   env:
+      #     DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
+      #     GIT_BRANCH: ${{ github.ref }}
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Build
+        run: npm run build
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: 'Link check: Dotcom'
+        env:
+          DOCS_VERSION: 'dotcom'
+        run: npm run link-check

.github/workflows/link-check-test.yml .github/workflows/link-check-ghae.yml.github/workflows/link-check-test.yml renamed to .github/workflows/link-check-ghae.yml

@@ -1,4 +1,4 @@
-name: Link Checker
+name: 'Link Checker: GitHub AE'
 
 on:
   workflow_dispatch:
@@ -17,7 +17,7 @@ jobs:
         with:
           cancel_others: 'false'
           github_token: ${{ github.token }}
-          paths: '[".github/workflows/link-check-test.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
+          paths: '[".github/workflows/link-check-ghae.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
   build:
     needs: see_if_should_skip
     runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
@@ -51,5 +51,7 @@ jobs:
         run: npm run build
 
       - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Link check
+        name: 'Link check: GitHub AE'
+        env:
+          DOCS_VERSION: 'github-ae'
         run: npm run link-check

.github/workflows/link-check-ghes.yml

@@ -0,0 +1,57 @@
+name: 'Link Checker: Enterprise Server'
+
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  see_if_should_skip:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
+        with:
+          cancel_others: 'false'
+          github_token: ${{ github.token }}
+          paths: '[".github/workflows/link-check-ghes.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
+  build:
+    needs: see_if_should_skip
+    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    steps:
+      # Each of these ifs needs to be repeated at each step to make sure the required check still runs
+      # Even if if doesn't do anything
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Checkout
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Setup node
+        uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
+        with:
+          node-version: 14.x
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Install
+        run: npm ci
+
+      ## TODO
+      # - if: ${{ github.repository == 'github/docs-internal' &&  needs.see_if_should_skip.outputs.should_skip != 'true' }}
+      #   name: Clone early access
+      #   run: npm run heroku-postbuild
+      #   env:
+      #     DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
+      #     GIT_BRANCH: ${{ github.ref }}
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: Build
+        run: npm run build
+
+      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
+        name: 'Link check: Enterprise Server'
+        env:
+          DOCS_VERSION: 'enterprise-server'
+        run: npm run link-check

.github/workflows/site-policy-sync.yml

@@ -29,13 +29,14 @@ jobs:
 
       # Pushes to other repo
       - name: Push folder to another repository
-        uses: crykn/copy_folder_to_another_repo_action@abc264e1c16eb3d7b1f7763bfdb0e1699ad43120
+        uses: crykn/copy_folder_to_another_repo_action@0282e8b9fef06de92ddcae9fe6cb44df6226646c
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_SITEPOLICY }}
         with:
           source_folder: 'content/github/site-policy'
           destination_repo: 'github/site-policy'
-          destination_branch: 'repo-sync'
+          destination_branch: 'main'
+          destination_branch_create: 'repo-sync'
           destination_folder: 'Policies'
           user_email: 'pcihon@users.noreply.github.com'
           user_name: 'pcihon'

assets/images/marketplace/apps-with-verified-publisher-badge.png

@@ -21,6 +21,10 @@ See the [contributing docs](/CONTRIBUTING.md) for general information about work
   - [`miniTocMaxHeadingLevel`](#minitocmaxheadinglevel)
   - [`allowTitleToDifferFromFilename`](#allowtitletodifferfromfilename)
   - [`defaultPlatform`](#defaultplatform)
+  - [`learningTracks`](#learningTracks)
+  - [`includeGuides`](#includeGuides)
+  - [`type`](#type)
+  - [`topics`](#topics)
   - [Escaping single quotes](#escaping-single-quotes)
 - [Autogenerated mini TOCs](#autogenerated-mini-tocs)
 - [Versioning](#versioning)
@@ -29,6 +33,7 @@ See the [contributing docs](/CONTRIBUTING.md) for general information about work
 - [Whitespace control](#whitespace-control)
 - [Links and image paths](#links-and-image-paths)
   - [Preventing transformations](#preventing-transformations)
+- [Creating new sublanding pages](#creating-new-sublanding-pages)
 
 ## Frontmatter
 
@@ -186,6 +191,39 @@ Example:
 defaultPlatform: linux
 ```
 
+### `learningTracks`
+- Purpose: Render a list of learning tracks on a product's sub-landing page.
+- type: `String`. This should reference learning tracks' names defined in [`data/learning-tracks/*.yml`](../data/learning-tracks/README.md).
+- Optional
+
+**Note: the first learning track is by-default the featured track.*
+
+### `includeGuides`
+- Purpose: Render a list of articles, filterable by `type` and `topics`. Only applicable when used with `layout: product-sublanding`.
+- Type: `Array`
+- Optional.
+
+Example:
+
+```yml
+includeGuides:
+  - /actions/guides/about-continuous-integration
+  - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+  - /actions/guides/building-and-testing-nodejs
+  - /actions/guides/building-and-testing-powershell
+```
+
+### `type`
+- Purpose: Indicate the type of article. 
+- Type: `String`, one of the `overview`, `quick_start`, `tutorial`, `how_to`, `reference`.
+- Optional.
+
+### `topics`
+- Purpose: Indicate the topics covered by the article.
+- Type: `String`
+- Optional.
+
+
 ### Escaping single quotes
 
 If you see two single quotes in a row (`''`) in YML frontmatter where you might expect to see one (`'`), this is the YML-preferred way to escape a single quote. From [the YAML spec](https://yaml.org/spec/history/2001-12-10.html):
@@ -274,3 +312,15 @@ Sometimes you want to link to a Dotcom-only article in Enterprise content and yo
 ```
 
 Sometimes the canonical home of content moves outside the docs site. None of the links included in [`lib/redirects/external-sites.json`](/lib/redirects/external-sites.json) get rewritten. See  [`contributing/redirects.md`](/contributing/redirects.md) for more info about this type of redirect.
+
+
+### Creating new sublanding pages
+
+To create a sublanding page (e.g. [Actions' Guide page](https://docs.github.com/en/actions/guides)), create or modify an existing markdown file with these specific frontmatter values:
+
+1. Use the sublanding page template by referencing it `layout: product-sublanding`
+2. (optional) Include the learning tracks in [`learningTracks`](#learningTracks)
+3. (optional) Define which articles to include with [`includeGuides`](#includeGuides).
+
+If using learning tracks, they need to be defined in [`data/learning-tracks/*.yml`](../data/learning-tracks/README.md).
+If using `includeGuides`, make sure each of the articles in this list has [`topics`](#topics) and [`type`](#type) in its frontmatter.

assets/images/marketplace/publisher-verification-checklist.png

@@ -20,7 +20,7 @@ To learn about publishing {% data variables.product.prodname_actions %} in {% da
 
 Anyone can share their apps with other users for free on {% data variables.product.prodname_marketplace %} but only apps owned by organizations can sell their app. 
 
-To publish paid plans for your app and display the verified creator badge, you must complete the publisher verification process. For more information, see "[Applying for publisher verification for your organization](/developers/github-marketplace/applying-for-publisher-verification-for-your-organization)" or "[Requirements for listing an app](/developers/github-marketplace/requirements-for-listing-an-app)."
+To publish paid plans for your app and display a marketplace badge, you must complete the publisher verification process. For more information, see "[Applying for publisher verification for your organization](/developers/github-marketplace/applying-for-publisher-verification-for-your-organization)" or "[Requirements for listing an app](/developers/github-marketplace/requirements-for-listing-an-app)."
 
 Once the organization meets the requirements, someone with owner permissions in the organization can publish paid plans for any of their apps. Each app with a paid plan also goes through a financial onboarding process to enable payments.
 

content/README.md

@@ -1,17 +1,22 @@
 ---
-title: About verified creator badges
-intro: 'Learn about the verified creator badges that are shown for some listings for apps and actions on {% data variables.product.prodname_marketplace %}.'
+title: About marketplace badges
+intro: 'Learn about the badges that you may see for some apps and actions listings on {% data variables.product.prodname_marketplace %}.'
+redirect_from:
+  - /developers/github-marketplace/about-verified-creator-badges
 versions:
   free-pro-team: '*'
 ---
 
 ### For GitHub Apps
 
-Apps with the {% octicon "verified" aria-label="The verified badge" %}, or verified creator badge, are owned by an organization that has completed the publisher verification process. 
+Apps with the {% octicon "verified" aria-label="The verified badge" %}, are owned by an organization that has:
+- Confirmed their domain
+- Confirmed their email address so {% data variables.product.prodname_dotcom %} Support can reach the organization
+- Required two-factor authentication for their organization. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)."
 
-![Verified creator badge for GitHub Apps](/assets/images/marketplace/apps-with-verified-creator-badges.png)
+![Marketplace badge for GitHub Apps](/assets/images/marketplace/apps-with-verified-publisher-badge.png)
 
-To learn more about the publisher verification process, see "[Applying for publisher verification for your organization](/developers/github-marketplace/applying-for-publisher-verification-for-your-organization)."
+To learn how you can add this badge to your app, see "[Applying for publisher verification for your organization](/developers/github-marketplace/applying-for-publisher-verification-for-your-organization)."
 
 For more information about the requirements for listing an app on {% data variables.product.prodname_marketplace %}, see "[Requirements for listing an app on {% data variables.product.prodname_marketplace %}](/marketplace/getting-started/requirements-for-listing-an-app-on-github-marketplace/)."