Merge pull request #815 from newrelic/develop

Release

Author: jerelmiller

.github/workflows/fetch-related-content.yml

@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
+        with:
+          ref: main
 
       - name: Setup node.js
         uses: actions/setup-node@v1
@@ -47,50 +49,12 @@ jobs:
           git commit -m 'chore(related-content): updated related content data'
           echo "::set-output name=commit::true"
 
-      - name: Temporarily disable "required_pull_request_reviews" branch protection
-        id: disable-branch-protection
-        if: always()
-        uses: actions/github-script@v1
-        with:
-          github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
-          previews: luke-cage-preview
-          script: |
-            const result = await github.repos.updateBranchProtection({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              branch: 'develop',
-              required_status_checks: null,
-              restrictions: null,
-              enforce_admins: null,
-              required_pull_request_reviews: null
-            })
-            console.log("Result:", result)
-
+      # Push directly to `main` branch because we want updates to the related
+      # content to trigger a deploy. If we commit directly to the `develop`
+      # branch, it would require a PR from the team to deploy the changes.
       - name: Push Commit
         if: steps.commit-changes.outputs.commit == 'true'
         uses: ad-m/[email protected]
         with:
           github_token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
-          branch: develop
-
-      - name: Re-enable "required_pull_request_reviews" branch protection
-        id: enable-branch-protection
-        if: always()
-        uses: actions/github-script@v1
-        with:
-          github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
-          previews: luke-cage-preview
-          script: |
-            const result = await github.repos.updateBranchProtection({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              branch: 'develop',
-              required_status_checks: null,
-              restrictions: null,
-              enforce_admins: true,
-              required_pull_request_reviews: {
-                dismiss_stale_reviews: true,
-                required_approving_review_count: 1
-              }
-            })
-            console.log("Result:", result)
+          branch: main

src/components/Agenda/Session.js

@@ -21,7 +21,7 @@ const Session = ({
   >
     <h4
       css={css`
-        font-size: 1rem;
+        font-size: 0.9rem;
         font-weight: 700;
         margin-bottom: 0.25rem;
       `}

src/images/nerd-days/speakers/AlecSwanson.jpg

@@ -37,6 +37,15 @@ import LindsyFarina from '../images/nerd-days/speakers/LindsyFarina.jpg';
 import TaliaNassi from '../images/nerd-days/speakers/TaliaNassi.jpg';
 import ThomasMartin from '../images/nerd-days/speakers/ThomasMartin.jpg';
 
+import AlecSwanson from '../images/nerd-days/speakers/AlecSwanson.jpg';
+import BrianThomason from '../images/nerd-days/speakers/BrianThomason.jpg';
+import ChrisTrombley from '../images/nerd-days/speakers/ChrisTrombley.jpg';
+import GabeObrien from '../images/nerd-days/speakers/GabeObrien.jpg';
+import LiamHurrell from '../images/nerd-days/speakers/LiamHurrell.jpg';
+import MichaelCaron from '../images/nerd-days/speakers/MichaelCaron.jpg';
+import PhilWeber from '../images/nerd-days/speakers/PhilWeber.jpg';
+import SebastianRamirez from '../images/nerd-days/speakers/SebastianRamirez.jpg';
+
 const NerdDaysPage = () => {
   const {
     site: { layout },
@@ -744,6 +753,54 @@ const speakers = [
     title: 'Director, Site Reliability',
     company: '27 Global',
   },
+  {
+    name: 'Alec Swanson',
+    image: AlecSwanson,
+    title: 'Software Engineer',
+    company: 'New Relic',
+  },
+  {
+    name: 'Brian Thomason',
+    image: BrianThomason,
+    title: 'Senior Partner Solutions Consultant',
+    company: 'New Relic',
+  },
+  {
+    name: 'Chris Trombley',
+    image: ChrisTrombley,
+    title: 'Senior Software Engineer',
+    company: 'New Relic',
+  },
+  {
+    name: "Gabe O'Brien",
+    image: GabeObrien,
+    title: 'Senior Software Engineer',
+    company: 'New Relic',
+  },
+  {
+    name: 'Liam Hurrell',
+    image: LiamHurrell,
+    title: 'Senior Technical Training Specialist',
+    company: 'New Relic',
+  },
+  {
+    name: 'Michael Caron',
+    image: MichaelCaron,
+    title: 'Senior Technical Training Specialist',
+    company: 'New Relic',
+  },
+  {
+    name: 'Phil Weber',
+    image: PhilWeber,
+    title: 'Senior Technical Training Specialist',
+    company: 'New Relic',
+  },
+  {
+    name: 'Sebastian Remirez',
+    image: SebastianRamirez,
+    title: 'Lead Software Engineer',
+    company: 'New Relic',
+  },
 ];
 
 const breakpoints = {