From a2a427f681ab91cb3e2be8a537104e12acd978e3 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Tue, 15 Dec 2020 15:03:05 -0800 Subject: [PATCH 1/3] re-enable graphql updater workflow (#16993) * re-enable graphql updater workflow * remove scheduled run temporarily * lint yaml --- .github/workflows/update-graphql-files.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-graphql-files.yml b/.github/workflows/update-graphql-files.yml index 0ba265a0f7a5..e51efbb5b72e 100644 --- a/.github/workflows/update-graphql-files.yml +++ b/.github/workflows/update-graphql-files.yml @@ -9,8 +9,9 @@ env: FREEZE: ${{ secrets.FREEZE }} on: - schedule: - - cron: '20 16 * * *' # run every day at 16:20 UTC / 8:20 PST + workflow_dispatch: + #schedule: + #- cron: '20 16 * * *' # run every day at 16:20 UTC / 8:20 PST jobs: update_graphql_files: @@ -36,7 +37,7 @@ jobs: - name: Run updater scripts env: # need to use a token from a user with access to github/github for this step - GITHUB_TOKEN: ${{ secrets.ZEKE_PAT_WITH_REPO_AND_WORKFLOW_SCOPE_FOR_REPO_SYNC }} + GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} run: | script/graphql/update-files.js - name: Create pull request From f329b5f3880d7e0ce7238948b03edc7e52c52025 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Tue, 15 Dec 2020 15:11:32 -0800 Subject: [PATCH 2/3] Run only english on staging (#16992) * Run only english on staging * Revert "Run only english on staging" This reverts commit af34c7a4497db4867a6f3facd34af316cd6b4b9a. * Update app.json * Update app.json Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com> --- app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.json b/app.json index 2ee194071794..ce6f572a4610 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,8 @@ "name": "docs.github.com", "env": { "NODE_ENV": "production", - "NPM_CONFIG_PRODUCTION": "true" + "NPM_CONFIG_PRODUCTION": "true", + "ENABLED_LANGUAGES": "en, de" }, "buildpacks": [ { "url": "https://github.com/DataDog/heroku-buildpack-datadog.git#1.21" }, From 6feed158c2622404e9b12c15b0ff0112d9315c55 Mon Sep 17 00:00:00 2001 From: Tammy Metz Date: Tue, 15 Dec 2020 18:27:41 -0500 Subject: [PATCH 3/3] Add warning about wildcard subdomains in DNS (#16846) Co-authored-by: Lucas Costi --- .../managing-a-custom-domain-for-your-github-pages-site.md | 6 +++++- .../troubleshooting-custom-domains-and-github-pages.md | 6 +----- data/reusables/pages/wildcard-dns-warning.md | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 data/reusables/pages/wildcard-dns-warning.md diff --git a/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md b/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md index 722694a35882..4fe5870a1c2e 100644 --- a/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md +++ b/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md @@ -40,7 +40,9 @@ To set up a `www` or custom subdomain, such as `www.example.com` or `blog.exampl {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.pages.save-custom-domain %} -5. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `.github.io`. If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` file should always point to `.github.io` or `.github.io`, excluding the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} +5. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `.github.io`. If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` record should always point to `.github.io` or `.github.io`, excluding the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} + +{% indented_data_reference site.data.reusables.pages.wildcard-dns-warning spaces=3 %} {% data reusables.command_line.open_the_multi_os_terminal %} 6. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your subdomain. ```shell @@ -71,6 +73,8 @@ To set up an apex domain, such as `example.com`, you must configure a _CNAME_ fi 185.199.110.153 185.199.111.153 ``` + +{% indented_data_reference site.data.reusables.pages.wildcard-dns-warning spaces=3 %} {% data reusables.command_line.open_the_multi_os_terminal %} 6. To confirm that your DNS record configured correctly, use the `dig` command, replacing _EXAMPLE.COM_ with your apex domain. Confirm that the results match the IP addresses for {% data variables.product.prodname_pages %} above. ```shell diff --git a/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md b/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md index cf13090436ee..132048eabb99 100644 --- a/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md +++ b/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md @@ -39,11 +39,7 @@ Make sure your site does not: - Use more than one `www` subdomain. For example, both `www.example.com` and `www.anotherexample.com`. - Use both an apex domain and custom subdomain. For example, both `example.com` and `docs.example.com`. -{% warning %} - -**Warning:** We strongly recommend not using wildcard DNS records, such as `*.example.com`. A wildcard DNS record will allow anyone to host a {% data variables.product.prodname_pages %} site at one of your subdomains. - -{% endwarning %} +{% data reusables.pages.wildcard-dns-warning %} For a list of supported custom domains, see "[About custom domains and {% data variables.product.prodname_pages %}](/articles/about-custom-domains-and-github-pages/#supported-custom-domains)." diff --git a/data/reusables/pages/wildcard-dns-warning.md b/data/reusables/pages/wildcard-dns-warning.md new file mode 100644 index 000000000000..468c509c00a5 --- /dev/null +++ b/data/reusables/pages/wildcard-dns-warning.md @@ -0,0 +1,5 @@ +{% warning %} + +**Warning:** We strongly recommend not using wildcard DNS records, such as `*.example.com`. A wildcard DNS record will allow anyone to host a {% data variables.product.prodname_pages %} site at one of your subdomains. + +{% endwarning %}