1
0
mirror of synced 2026-01-07 18:01:41 -05:00

Merge pull request #22566 from github/repo-sync

repo sync
This commit is contained in:
Octomerger Bot
2021-11-03 07:55:19 -04:00
committed by GitHub
2 changed files with 16 additions and 13 deletions

View File

@@ -1,21 +1,24 @@
import Link from 'next/link'
import { useRouter } from 'next/router'
import { MarkGithubIcon } from '@primer/octicons-react'
import { useTranslation } from 'components/hooks/useTranslation'
export const SmallFooter = () => {
const router = useRouter()
const { t } = useTranslation('footer')
return (
<footer className="container-xl px-3 mt-6 mb-8 px-md-6 position-relative d-flex flex-row-reverse flex-xl-row flex-wrap flex-xl-nowrap flex-justify-center flex-xl-justify-between f6 color-fg-muted">
<ul className="list-style-none d-flex flex-wrap col-12 col-xl-5 flex-justify-center flex-xl-justify-between mb-2 mb-xl-0">
<li className="mr-3 mr-xl-0">&copy; {new Date().getFullYear()} GitHub, Inc.</li>
<li className="mr-3 mr-xl-0">
<a href="https://docs.github.com/en/github/site-policy/github-terms-of-service">
<Link href={`/${router.locale}/github/site-policy/github-terms-of-service`}>
{t('terms')}
</a>
</Link>
</li>
<li className="mr-3 mr-xl-0">
<a href="https://docs.github.com/en/github/site-policy/github-privacy-statement">
<Link href={`/${router.locale}/github/site-policy/github-privacy-statement`}>
{t('privacy')}
</a>
</Link>
</li>
<li className="mr-3 mr-xl-0">
<a href="https://github.com/security">{t('product.links.security')}</a>
@@ -24,7 +27,7 @@ export const SmallFooter = () => {
<a href="https://www.githubstatus.com/">{t('support.links.status')}</a>
</li>
<li>
<a href="/">{t('support.links.help')}</a>
<Link href={`/${router.locale}`}>{t('support.links.help')}</Link>
</li>
</ul>
@@ -45,7 +48,7 @@ export const SmallFooter = () => {
<a href="https://github.com/pricing">{t('product.links.pricing')}</a>
</li>
<li className="mr-3 mr-xl-0">
<a href="https://docs.github.com">{t('platform.links.developer_api')}</a>
<Link href={`/${router.locale}/developers`}>{t('platform.links.developer_api')}</Link>
</li>
<li className="mr-3 mr-xl-0">
<a href="https://services.github.com">{t('support.links.training')}</a>

View File

@@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.6", "3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
@@ -119,7 +119,7 @@ jobs:
# You can use PyPy versions in python-version.
# For example, pypy2 and pypy3
matrix:
python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
@@ -182,12 +182,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
python-version: ["3.6", "3.7", "3.8", "3.9", pypy2, pypy3]
exclude:
- os: macos-latest
python-version: 3.6
python-version: "3.6"
- os: windows-latest
python-version: 3.6
python-version: "3.6"
```
{% endraw %}
@@ -344,7 +344,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.7, 3.8, 3.9]
python: ["3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
@@ -378,7 +378,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.6", "3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2