Branch was updated using the 'autoupdate branch' Actions workflow.

Octomerger · web-flow · commit a0c3cec2e0a5 · 2020-10-15T13:21:21.000-07:00
diff --git a/assets/fonts/alliance/alliance-no-1-bold.woff b/assets/fonts/alliance/alliance-no-1-bold.woff
diff --git a/assets/fonts/alliance/alliance-no-1-extrabold.woff b/assets/fonts/alliance/alliance-no-1-extrabold.woff
diff --git a/assets/fonts/alliance/alliance-no-1-medium.woff b/assets/fonts/alliance/alliance-no-1-medium.woff
diff --git a/assets/fonts/alliance/alliance-no-1-regular.woff b/assets/fonts/alliance/alliance-no-1-regular.woff
diff --git a/content/actions/index.md b/content/actions/index.md
@@ -2,12 +2,15 @@
 title: GitHub Actions Documentation
 shortTitle: GitHub Actions
 intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.'
+introLinks:
+  quickstart: /actions/quickstart
+  learn: /actions/learn-github-actions
 gettingStartedLinks:
-  - /actions/quickstart
-  - /actions/learn-github-actions
-guideLinks:
   - /actions/managing-workflow-runs
   - /actions/hosting-your-own-runners
+guideLinks:
+  - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+  - /actions/guides/about-packaging-with-github-actions
 popularLinks:
   - /actions/reference/workflow-syntax-for-github-actions
   - /actions/reference/events-that-trigger-workflows
@@ -36,10 +39,10 @@ versions:
 <div class="d-lg-flex gutter my-6 py-6">
   <div class="col-12 col-lg-4 mb-4 mb-lg-0">
     <div class="featured-links-heading pb-4">
-      <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.getting_started %}</h3>
+      <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.guides %}</h3>
     </div>
     <ul class="list-style-none">
-      {% for link in gettingStartedLinks %}
+      {% for link in guideLinks %}
         <li>{% include featured-link %}</li>
       {% endfor %}
     </ul>
@@ -61,40 +64,16 @@ versions:
       <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">Manage workflows</h3>
     </div>
     <ul class="list-style-none">
-      {% for link in guideLinks %}
+      {% for link in gettingStartedLinks %}
         <li>{% include featured-link %}</li>
       {% endfor %}
     </ul>
   </div>
 </div>
-<!-- Featured resources -->
-<div class="d-lg-flex gutter-lg my-6 py-6 text-center flex-items-stretch">
-  <div class="col-12 col-lg-4 mb-2 mb-lg-0">
-    <a href="/actions/creating-actions" class="d-block text-gray-dark no-underline hover-grow Box p-5 bg-gray-light">
-      <div class="mb-4 d-flex flex-justify-center"><div class="circle p-3 bg-blue text-white">{% octicon "bookmark" width="24" %}</div></div>
-      <h4>Create actions</h4>
-      <p class="mb-0">A complete guide to creating and sharing actions with the community.</p>
-    </a>
-  </div>
-  <div class="col-12 col-lg-4 mb-2 mb-lg-0">
-    <a href="https://github.com/actions/starter-workflows" class="d-block text-gray-dark no-underline hover-grow Box p-5 bg-gray-light">
-      <div class="mb-4 d-flex flex-justify-center"><div class="circle p-3 bg-purple text-white">{% octicon "rocket" width="24" %}</div></div>
-      <h4>Starter workflows</h4>
-      <p class="mb-0">A collection of workflow files to help you get started with GitHub Actions.</p>
-    </a>
-  </div>
-  <div class="col-12 col-lg-4 mb-2 mb-lg-0">
-    <a href="https://github.com/marketplace?type=actions" class="d-block text-gray-dark no-underline hover-grow Box p-5 bg-gray-light">
-      <div class="mb-4 d-flex flex-justify-center"><div class="circle p-3 bg-orange text-white">{% octicon "light-bulb" width="24" %}</div></div>
-      <h4>GitHub Actions Marketplace</h4>
-      <p class="mb-0">Explore community actions and supercharge your workflow.</p>
-    </a>
-  </div>
-</div>
 
 <!-- Code examples -->
 <div class="mt-6 pt-6">
-  <h2 class="mb-2">Guides</h2>
+  <h2 class="mb-2">More guides</h2>
 
   <div class="d-flex flex-wrap gutter">
     <div class="col-12 col-lg-4 mb-4">
@@ -195,5 +174,5 @@ versions:
     </div>
   </div>
 
-  <a href="/actions/guides" class="btn btn-outline mt-4">More guides {% octicon "arrow-right" %}</a>
+  <a href="/actions/guides" class="btn btn-outline mt-4">Show all guides {% octicon "arrow-right" %}</a>
 </div>
diff --git a/content/admin/enterprise-management/upgrade-requirements.md b/content/admin/enterprise-management/upgrade-requirements.md
@@ -21,15 +21,15 @@ versions:
 
 ### Recommendations
 
-- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.supported[1] }} to {{ enterpriseVersions.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[2] }} to {{ enterpriseVersions.latest }}.
+- Include as few upgrades as possible in your upgrade process. For example, instead of upgrading from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.supported[1] }} to {{ enterpriseServerReleases.latest }}, you could upgrade from {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[2] }} to {{ enterpriseServerReleases.latest }}.
 - If you’re several versions behind, upgrade {% data variables.product.product_location_enterprise %} as far forward as possible with each step of your upgrade process. Using the latest version possible on each upgrade allows you to take advantage of performance improvements and bug fixes. For example, you could upgrade from {% data variables.product.prodname_enterprise %} 2.7 to 2.8 to 2.10, but upgrading from {% data variables.product.prodname_enterprise %} 2.7 to 2.9 to 2.10 uses a later version in the second step.
 - Use the latest patch release when upgrading. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %}
 - Use a staging instance to test the upgrade steps. For more information, see "[Setting up a staging instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)."
 - When running multiple upgrades, wait at least 24 hours between feature upgrades to allow data migrations and backgrounded upgrade tasks to fully complete.
 
 ### Requirements
 
-- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseVersions.supported[1] }} or {{ enterpriseVersions.supported[2] }}.
+- You must upgrade from a feature release that's **at most** two releases behind. For example, to upgrade to {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.latest }}, you must be on {% data variables.product.prodname_enterprise %} {{ enterpriseServerReleases.supported[1] }} or {{ enterpriseServerReleases.supported[2] }}.
 - {% data reusables.enterprise_installation.hotpatching-explanation %}
 - A hotpatch may require downtime if the affected services (like kernel, MySQL, or Elasticsearch) require a VM reboot or a service restart. You'll be notified when a reboot or restart is required. You can complete the reboot or restart at a later time.
 - Additional root storage must be available when upgrading through hotpatching, as it installs multiple versions of certain services until the upgrade is complete. Pre-flight checks will notify you if you don't have enough root disk storage.
diff --git a/includes/error-404-deprecation-message.html b/includes/error-404-deprecation-message.html
@@ -1,5 +1,5 @@
-{% if enterpriseVersions.deprecated contains currentVersion %}
-{% assign deprecatedDate = enterpriseVersions.dates[currentVersion].deprecationDate %}
+{% if enterpriseServerReleases.deprecated contains currentVersion %}
+{% assign deprecatedDate = enterpriseServerReleases.dates[currentVersion].deprecationDate %}
   <div class="deprecation-banner border rounded-1 mb-2 bg-yellow-light p-3 border-yellow f5">
     <p>
       <b>
diff --git a/layouts/product-landing.html b/layouts/product-landing.html
@@ -12,15 +12,15 @@
         <header class="d-flex gutter mb-6">
           <div class="col-12 col-lg-7">
             <span class="text-mono text-gray">Product</span>
-            <h1 class="mb-3">{{ page.shortTitle }}</h1>
+            <h1 class="mb-3 font-mktg">{{ page.shortTitle }}</h1>
             <div class="lead-mktg text-gray">{{ page.intro }}</div>
 
-            <a href="{{ gettingStartedLinks[0].href }}" class="btn btn-large f4 btn-blue mt-3">
+            <a href="{{ page.introLinks.quickstart }}" class="btn btn-large f4 btn-blue mt-3">
               Quickstart
             </a>
 
-            <a href="{{ gettingStartedLinks[1].href }}" class="ml-3 btn btn-large f4 btn-outline mt-3">
-              Learn more
+            <a href="{{ page.introLinks.learn }}" class="ml-3 btn btn-large f4 btn-outline mt-3">
+              Learn {% data variables.product.prodname_actions %}
             </a>
           </div>
         </header>
diff --git a/lib/frontmatter.js b/lib/frontmatter.js
@@ -63,6 +63,13 @@ const schema = {
     },
     allowTitleToDifferFromFilename: {
       type: 'boolean'
+    },
+    introLinks: {
+      type: 'object',
+      properties: {
+        quickstart: { type: 'string' },
+        learn: { type: 'string' }
+      }
     }
   }
 }
diff --git a/middleware/context.js b/middleware/context.js
@@ -34,9 +34,9 @@ module.exports = async function contextualize (req, res, next) {
   req.context.query = req.query
   req.context.languages = languages
   req.context.earlyAccessPaths = earlyAccessPaths
-  req.context.enterpriseVersions = enterpriseServerReleases
   req.context.productNames = productNames
   req.context.enterpriseServerReleases = enterpriseServerReleases
+  req.context.enterpriseServerVersions = Object.keys(allVersions).filter(version => version.startsWith('enterprise-server@'))
   req.context.redirects = redirects
   req.context.site = site[req.language].site
   req.context.siteTree = siteTree
diff --git a/script/new-versioning/update-not-fpt-conditionals.js b/script/new-versioning/update-not-fpt-conditionals.js
@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+
+const fs = require('fs')
+const path = require('path')
+const walk = require('walk-sync')
+const frontmatter = require('@github-docs/frontmatter')
+const contentPath = path.join(process.cwd(), 'content')
+const dataPath = path.join(process.cwd(), 'data')
+
+// [start-readme]
+//
+// Run this script to update these Liquid conditionals:
+//
+// {% if currentVersion != 'free-pro-team@latest' %}
+//
+// to:
+//
+// {% if enterpriseServerVersions contains currentVersion %}
+//
+// [end-readme]
+
+// The new conditional to add
+const newConditional = 'enterpriseServerVersions contains currentVersion'
+
+// The old conditional to replace
+const oldConditional = /currentVersion != ["']free-pro-team@latest["']/g
+
+console.log('Working...\n')
+
+const englishContentFiles = walkContent(contentPath)
+const englishDataFiles = walkData(dataPath, englishContentFiles)
+
+function walkContent (dirPath) {
+  return walk(dirPath, { includeBasePath: true, directories: false })
+    .filter(file => file.includes('/content/'))
+    .filter(file => file.endsWith('.md'))
+    .filter(file => !file.endsWith('README.md'))
+}
+
+function walkData (dirPath, contentFiles) {
+  return walk(dirPath, { includeBasePath: true, directories: false })
+    .filter(file => file.includes('/data/reusables') || file.includes('/data/variables'))
+    .filter(file => !file.endsWith('README.md'))
+}
+
+englishDataFiles
+  .forEach(file => {
+    const dataContent = fs.readFileSync(file, 'utf8')
+
+    // Update Liquid in data files
+    const newDataContent = updateLiquid(dataContent, file)
+
+    fs.writeFileSync(file, newDataContent)
+  })
+
+englishContentFiles
+  .forEach(file => {
+    const { data, content } = frontmatter(fs.readFileSync(file, 'utf8'))
+
+    // Update Liquid in content files
+    const newContent = updateLiquid(content, file)
+
+    // Update Liquid in frontmatter props
+    Object.keys(data)
+      .filter(key => typeof data[key] === 'string')
+      .forEach(key => {
+        data[key] = updateLiquid(data[key], file)
+      })
+
+    fs.writeFileSync(file, frontmatter.stringify(newContent, data, { lineWidth: 10000 }))
+  })
+
+function updateLiquid (content) {
+  return content.replace(oldConditional, newConditional)
+}
+
+console.log('Done!')
diff --git a/stylesheets/new-mktg.scss b/stylesheets/new-mktg.scss
@@ -54,3 +54,48 @@
 .bg-blue-dark {
   background-color: $blue-800 !important;
 }
+
+// stylelint-disable primer/no-unused-vars
+
+// Typography
+
+$marketing-font-path: "/assets/fonts/alliance/";
+$font-family-mktg: "Alliance No.1", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
+$font-weight-extrabold: 800 !default;
+
+.font-mktg {
+  font-family: $font-family-mktg;
+}
+
+// Type
+@font-face {
+  font-family: "Alliance No.1";
+  font-style: normal;
+  font-weight: $font-weight-normal;
+  src: local("Alliance No.1 Regular"), local("alliance-no-1-regular"), url("#{$marketing-font-path}alliance-no-1-regular.woff") format("woff");
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Alliance No.1";
+  font-style: normal;
+  font-weight: $font-weight-semibold;
+  src: local("Alliance No.1 Medium"), local("alliance-no-1-medium"), url("#{$marketing-font-path}alliance-no-1-medium.woff") format("woff");
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Alliance No.1";
+  font-style: normal;
+  font-weight: $font-weight-bold;
+  src: local("Alliance No.1 Bold"), local("alliance-no-1-bold"), url("#{$marketing-font-path}alliance-no-1-bold.woff") format("woff");
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Alliance No.1";
+  font-style: normal;
+  font-weight: $font-weight-extrabold;
+  src: local("Alliance No.1 ExtraBold"), local("alliance-no-1-extrabold"), url("#{$marketing-font-path}alliance-no-1-extrabold.woff") format("woff");
+  font-display: swap;
+}
diff --git a/tests/fixtures/page-versioned-for-all-enterprise-releases.md b/tests/fixtures/page-versioned-for-all-enterprise-releases.md
@@ -0,0 +1,19 @@
+---
+title: Page versioned for all Enterprise releases
+versions:
+  free-pro-team: '*'
+  enterprise-server: '*'
+---
+
+{% if currentVersion == 'free-pro-team@latest' %}
+
+This text should only render on non-Enterprise
+
+{% endif %}
+
+
+{% if enterpriseServerVersions contains currentVersion %}
+
+This text should render on any actively supported version of Enterprise Server
+
+{% endif %}
diff --git a/tests/unit/page.js b/tests/unit/page.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const cheerio = require('cheerio')
 const Page = require('../../lib/page')
+const allVersionIds = Object.keys(require('../../lib/all-versions'))
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 // get the `free-pro-team` segment of `free-pro-team@latest`
@@ -121,6 +122,43 @@ describe('Page class', () => {
       const $ = cheerio.load(rendered)
       expect($('a[href="/capistrano"]').length).toBe(1)
     })
+
+    // Most of our Liquid versioning tests are in https://github.com/docs/render-content,
+    // But they don't have access to our currently supported versions, which we're testing here.
+    // This test ensures that this works as expected: {% if enterpriseServerVersions contains currentVersion %}
+    test('renders the expected Enterprise Server versioned content', async () => {
+      const page = new Page({
+        relativePath: 'page-versioned-for-all-enterprise-releases.md',
+        basePath: path.join(__dirname, '../fixtures'),
+        languageCode: 'en'
+      })
+      // set version to the latest enteprise version
+      const context = {
+        currentVersion: `enterprise-server@${enterpriseServerReleases.latest}`,
+        currentLanguage: 'en',
+        enterpriseServerVersions: allVersionIds.filter(id => id.startsWith('enterprise-server@'))
+      }
+      let rendered = await page.render(context)
+      let $ = cheerio.load(rendered)
+      expect($.text()).toBe('This text should render on any actively supported version of Enterprise Server')
+      expect($.text()).not.toBe('This text should only render on non-Enterprise')
+
+      // change version to the oldest enterprise version, re-render, and test again;
+      // the results should be the same
+      context.currentVersion = `enterprise-server@${enterpriseServerReleases.oldestSupported}`
+      rendered = await page.render(context)
+      $ = cheerio.load(rendered)
+      expect($.text()).toBe('This text should render on any actively supported version of Enterprise Server')
+      expect($.text()).not.toBe('This text should only render on non-Enterprise')
+
+      // change version to non-enterprise, re-render, and test again;
+      // the results should be the opposite
+      context.currentVersion = nonEnterpriseDefaultVersion
+      rendered = await page.render(context)
+      $ = cheerio.load(rendered)
+      expect($.text()).not.toBe('This text should render on any actively supported version of Enterprise Server')
+      expect($.text()).toBe('This text should only render on non-Enterprise')
+    })
   })
 
   test('preserves `languageCode`', () => {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,13 @@ const schema = {`
`63`	`63`	`},`
`64`	`64`	`allowTitleToDifferFromFilename: {`
`65`	`65`	`type: 'boolean'`
	`66`	`+ },`
	`67`	`+ introLinks: {`
	`68`	`+ type: 'object',`
	`69`	`+ properties: {`
	`70`	`+ quickstart: { type: 'string' },`
	`71`	`+ learn: { type: 'string' }`
	`72`	`+ }`
`66`	`73`	`}`
`67`	`74`	`}`
`68`	`75`	`}`