Merge branch 'main' into code-scanning-faq-fix

Author: joshjohanning

assets/images/help/codespaces/delete-codespace-vscode.png

@@ -25,7 +25,7 @@ export const ArticleList = ({
     <>
       {title && (
         <div className="mb-4 d-flex flex-items-baseline">
-          <h3 className={cx('f4 text-semibold')}>{title}</h3>
+          <h2 className={cx('f4 text-semibold')}>{title}</h2>
           {viewAllHref && (
             <Link
               href={viewAllHref}
@@ -60,13 +60,23 @@ export const ArticleList = ({
                   href={link.href}
                   className="py-3"
                   title={
-                    <h4 data-testid="link-with-intro-title">
+                    !link.hideIntro && link.intro ? (
+                      <h3 className="f4" data-testid="link-with-intro-title">
+                        <span
+                          dangerouslySetInnerHTML={
+                            link.fullTitle ? { __html: link.fullTitle } : { __html: link.title }
+                          }
+                        />
+                      </h3>
+                    ) : (
                       <span
+                        className="f4 text-bold d-block"
+                        data-testid="link-with-intro-title"
                         dangerouslySetInnerHTML={
                           link.fullTitle ? { __html: link.fullTitle } : { __html: link.title }
                         }
-                      />
-                    </h4>
+                      ></span>
+                    )
                   }
                 >
                   {!link.hideIntro && link.intro && (

components/landing/ArticleList.tsx

@@ -14,7 +14,7 @@ export const CodeExampleCard = ({ example }: Props) => {
       href={`https://github.com/${example.href}`}
     >
       <div className="p-4">
-        <h4 dangerouslySetInnerHTML={{ __html: example.title }} />
+        <h3 className="f4" dangerouslySetInnerHTML={{ __html: example.title }} />
         <p
           className="mt-2 mb-4 color-fg-muted"
           dangerouslySetInnerHTML={{ __html: example.description }}

components/landing/CodeExampleCard.tsx

@@ -13,7 +13,7 @@ export const GuideCard = ({ guide }: Props) => {
         className="Box color-shadow-medium height-full d-block hover-shadow-large no-underline color-fg-default p-5"
         href={guide.href}
       >
-        <h2 dangerouslySetInnerHTML={{ __html: guide.title }} />
+        <h3 className="f2" dangerouslySetInnerHTML={{ __html: guide.title }} />
         <p
           className="mt-2 mb-4 color-fg-muted"
           dangerouslySetInnerHTML={{ __html: guide.intro || '' }}

components/landing/GuideCard.tsx

@@ -34,11 +34,11 @@ const ProductTreeNodeList = ({ treeNode }: { treeNode: ProductTreeNode }) => {
 
   return (
     <div className="col-12 col-lg-4 mb-6 height-full">
-      <h4 className="mb-3">
+      <h3 className="mb-3 f4">
         <Link className="color-unset" href={treeNode.href}>
           {treeNode.renderedFullTitle}
         </Link>
-      </h4>
+      </h3>
 
       <ActionList
         {...{ as: 'ul' }}

components/landing/ProductArticlesList.tsx

@@ -15,7 +15,7 @@ topics:
   - Profiles
 shortTitle: Organization's profile
 ---
-You can optionally choose to add a description, location, website, and email address for your organization, and pin important repositories.{% ifversion not ghes and not ghae %} You can customize your organization's profile by adding a README.md file. For more information, see "[Customizing your organization's profile](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile)."{% endif %}
+You can optionally choose to add a description, location, website, and email address for your organization, and pin important repositories.{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4749 %} You can customize your organization's profile by adding a README.md file. For more information, see "[Customizing your organization's profile](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile)."{% endif %}
 
 {% ifversion fpt or ghec %}To confirm your organization's identity and display a "Verified" badge on your organization profile page, you must verify your organization's domains with {% data variables.product.product_name %}. For more information, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)."{% endif %}
 

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile.md

@@ -69,15 +69,17 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
       - name: Build with Gradle
-        run: ./gradlew build
+        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+        with:
+          arguments: build
 ```
 
 This workflow performs the following steps:
 
 1. The `checkout` step downloads a copy of your repository on the runner.
 2. The `setup-java` step configures the Java 11 JDK by Adoptium.
 3. The "Validate Gradle wrapper" step validates the checksums of Gradle Wrapper JAR files present in the source tree.
-4. The "Build with Gradle" step runs the `gradlew` wrapper script to ensure that your code builds, tests pass, and a package can be created.
+4. The "Build with Gradle" step does a build using the `gradle/gradle-build-action` action provided by the Gradle organization on {% data variables.product.prodname_dotcom %}. The action takes care of invoking Gradle, collecting results, and caching state between jobs. For more information see [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action).
 
 The default starter workflows are excellent starting points when creating your build and test workflow, and you can customize the starter workflow to suit your project’s needs.
 
@@ -104,38 +106,17 @@ steps:
   - name: Validate Gradle wrapper
     uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
   - name: Run the Gradle package task
-    run: ./gradlew -b ci.gradle package
+    uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+    with:
+      arguments: -b ci.gradle package
 ```
 {% endraw %}
 
 ## Caching dependencies
 
-When using {% data variables.product.prodname_dotcom %}-hosted runners, you can cache your dependencies to speed up your workflow runs. After a successful run, your local Gradle package cache will be stored on GitHub Actions infrastructure. In future workflow runs, the cache will be restored so that dependencies don't need to be downloaded from remote package repositories. You can cache dependencies simply using the [`setup-java` action](https://github.com/marketplace/actions/setup-java-jdk) or can use [`cache` action](https://github.com/actions/cache) for custom and more advanced configuration. 
+When using {% data variables.product.prodname_dotcom %}-hosted runners, your build dependencies can be cached to speed up your workflow runs. After a successful run, the `gradle/gradle-build-action` caches important parts of the Gradle user home directory. In future jobs, the cache will be restored so that build scripts won't need to be recompiled and dependencies won't need to be downloaded from remote package repositories.
 
-{% raw %}
-```yaml{:copy}
-steps:
-  - uses: actions/checkout@v2
-  - name: Set up JDK 11
-    uses: actions/setup-java@v2
-    with:
-      java-version: '11'
-      distribution: 'adopt'
-      cache: gradle
-  - name: Validate Gradle wrapper
-    uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-  - name: Build with Gradle
-    run: ./gradlew build
-  - name: Cleanup Gradle Cache
-    # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-    # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-    run: |
-      rm -f ~/.gradle/caches/modules-2/modules-2.lock
-      rm -f ~/.gradle/caches/modules-2/gc.properties
-```
-{% endraw %}
-
-This workflow will save the contents of your local Gradle package cache, located in the `.gradle/caches` and `.gradle/wrapper` directories of the runner's home directory. The cache key will be the hashed contents of the gradle build files (including the Gradle wrapper properties file), so any changes to them will invalidate the cache.
+Caching is enabled by default when using the `gradle/gradle-build-action` action. For more information, see [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action#caching).
 
 ## Packaging workflow data as artifacts
 
@@ -153,7 +134,10 @@ steps:
       distribution: 'adopt'
   - name: Validate Gradle wrapper
     uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-  - run: ./gradlew build
+  - name: Build with Gradle
+    uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+    with:
+      arguments: build
   - uses: actions/upload-artifact@v2
     with:
       name: Package

content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md

@@ -85,10 +85,10 @@ jobs:
         swift: ["5.2", "5.3"]
     runs-on: {% raw %}${{ matrix.os }}{% endraw %}
     steps:
-      - uses: fwal/setup-swift@d43a564349d1341cd990cfbd70d94d63b8899475
+      - uses: fwal/setup-swift@2040b795e5c453c3a05fcb8316496afc8a74f192
         with:
           swift-version: {% raw %}${{ matrix.swift }}{% endraw %}
-      - uses: actions/checkout@
+      - uses: actions/checkout@v2
       - name: Build
         run: swift build
       - name: Run tests
@@ -102,7 +102,7 @@ You can configure your job to use a single specific version of Swift, such as `5
 {% raw %}
 ```yaml{:copy}
 steps:
-  - uses: fwal/setup-swift@d43a564349d1341cd990cfbd70d94d63b8899475
+  - uses: fwal/setup-swift@2040b795e5c453c3a05fcb8316496afc8a74f192
     with:
       swift-version: "5.3.3"
   - name: Get swift version
@@ -118,7 +118,7 @@ You can use the same commands that you use locally to build and test your code u
 ```yaml{:copy}
 steps:
   - uses: actions/checkout@v2
-  - uses: fwal/setup-swift@d43a564349d1341cd990cfbd70d94d63b8899475
+  - uses: fwal/setup-swift@2040b795e5c453c3a05fcb8316496afc8a74f192
     with:
       swift-version: "5.3.3"
   - name: Build

content/actions/automating-builds-and-tests/building-and-testing-swift.md

@@ -126,7 +126,7 @@ The token also includes custom claims provided by {% data variables.product.prod
 | `repository_owner`| The name of the organization in which the `repository` is stored.                   | 
 | `run_id`| The ID of the workflow run that triggered the workflow.                   | 
 | `run_number`| The number of times this workflow has been run.                   | 
-| `run_attempt`| The number of time this workflow run was been retried.                    | 
+| `run_attempt`| The number of times this workflow run has been retried.                    | 
 | `workflow`| The name of the workflow.                   | 
 
 ### Defining trust conditions on cloud roles using OIDC claims
@@ -161,7 +161,7 @@ You can configure a subject that filters for a specific [environment](/actions/d
 
 #### Filtering for `pull_request` events
 
-You can configure a subject that filters for the [`pull_request`](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags) event. In this example, the workflow run must have been triggered by a `pull_request` event in a repository named `octo-repo` that is owned by the `octo-org` organization:
+You can configure a subject that filters for the [`pull_request`](/actions/learn-github-actions/events-that-trigger-workflows#pull_request) event. In this example, the workflow run must have been triggered by a `pull_request` event in a repository named `octo-repo` that is owned by the `octo-org` organization:
 
 
 |        |             |