Skip to content

Commit

Permalink
Merge pull request #1566 from EnterpriseDB/release/2021-07-16
Browse files Browse the repository at this point in the history
Release: 2021-07-16
Former-commit-id: c4695f6
  • Loading branch information
josh-heyer authored Jul 16, 2021
2 parents 98616e1 + 75f8f1e commit 46cb395
Show file tree
Hide file tree
Showing 120 changed files with 214,961 additions and 24,793 deletions.
49 changes: 24 additions & 25 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json
// For format details, see https://aka.ms/vscode-remote/devcontainer.json
{
"name": "EDB Docs w/ Python 3 and Node.js 14",
"dockerFile": "Dockerfile",
"name": "EDB Docs w/ Python 3 and Node.js 14",
"dockerFile": "Dockerfile",

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"ms-azuretools.vscode-docker",
"eamodio.gitlens",
"github.vscode-pull-request-github"
],
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"ms-azuretools.vscode-docker",
"eamodio.gitlens",
"github.vscode-pull-request-github"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [8000],
"appPort": [8000],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [8000],
"appPort": [8000],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "yarn install",
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "yarn install",

// docker in docker (https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/docker-in-docker.md)
"runArgs": ["--init", "--privileged"],
"overrideCommand": false
// docker in docker (https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/docker-in-docker.md)
"runArgs": ["--init", "--privileged"],
"overrideCommand": false

// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "node"
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "node"
}

12 changes: 8 additions & 4 deletions .github/ISSUE_TEMPLATE/problem-with-topic.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
---
name: Problem with a topic
about: Report a problem you've observed while reading a topic
title: 'Problem on (PUT PAGE PATH / URL / TITLE HERE)'
labels: ''
assignees: ''

title: "Problem on (PUT PAGE PATH / URL / TITLE HERE)"
labels: ""
assignees: ""
---

## Summary

A short description of the problem you observed. Ex: "Code sample fails with error", "Link is broken"

## Where did you see the problem?

Describe the location within the text, ex: "in the section titled 'Further reading', the 2nd link doesn't load"

## Expected behavior

Describe what you expected, changes you'd like to see, etc.

## Screenshots

If applicable, paste / upload screenshots to illustrate the problem you saw

## Browser / Platform

Include the name of the browser and operating system you were using, along with versions

## Additional notes

Anything else you'd like to add that might help us to fix the problem
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/propose-new-topic.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
---
name: Propose a new topic
about: Suggest the addition of a new page or section
title: ''
labels: 'enhancement'
assignees: ''

title: ""
labels: "enhancement"
assignees: ""
---

## Summary

A short description of what you'd like to see covered

## Background info

What do you already know about the topic? What would you like to learn? What sort of things will this information help you to do?

(If you're proposing this topic because you think it would benefit *someone else*, then summarize *their* background knowledge and needs)
(If you're proposing this topic because you think it would benefit _someone else_, then summarize _their_ background knowledge and needs)

## Additional notes

Anything else you'd like to add that might help us to fix the problem
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/suggest-addition-to-topic.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
name: Suggest an addition
about: Suggest an improvement to a topic
title: 'Idea for (PUT PAGE PATH / URL / TITLE HERE)'
labels: 'enhancement'
assignees: ''

title: "Idea for (PUT PAGE PATH / URL / TITLE HERE)"
labels: "enhancement"
assignees: ""
---

## Summary

A short description of what you'd like to see. Ex: "An example using a Lateral Join would be nice"

## Where would you like to see this added?

Describe the location within the page's text that would be improved by addition (if relevant).

## Rationale
Why you'd like to see this addition. Be detailed! Ex: "Results currently require post-processing to bring in contextual info; the use of a lateral join to perform this step would simplify the example while demonstrating a pure-SQL solution"

Why you'd like to see this addition. Be detailed! Ex: "Results currently require post-processing to bring in contextual info; the use of a lateral join to perform this step would simplify the example while demonstrating a pure-SQL solution"
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/typo-or-minor-flaw.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: There is a typo (or minor mistake)
about: Report a small problem you've observed while reading a topic
title: 'Problem on (PUT PAGE PATH / URL / TITLE HERE)'
labels: ''
assignees: ''

title: "Problem on (PUT PAGE PATH / URL / TITLE HERE)"
labels: ""
assignees: ""
---

Please write a short description of the problem you observed. Ex: "thier is a misspelling", "https://grogle.com/search is broken"
2 changes: 2 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Please list, at a high level, what changed in your branch. If you changed content, include the product, guide, and version as applicable.

**Examples**

- Fixed typo in EPAS 13 epas_inst_linux guide
- Added more detail to ARK 3.5 getting started guide introduction
- Fixed broken link on `/supported-open-source/pgbackrest/05-retention_policy/` page
Expand All @@ -12,6 +13,7 @@ Please list, at a high level, what changed in your branch. If you changed conten
Please check all boxes that apply (`[ ]` is unchecked, `[x]` is checked)

**Content**

- [ ] This PR adds new content
- [ ] This PR changes existing content
- [ ] This PR removes existing content
108 changes: 54 additions & 54 deletions .github/workflows/deploy-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,62 @@ jobs:
build-deploy:
runs-on: ubuntu-latest
steps:
- name: Cleanup disk
uses: curoky/[email protected]
with:
retain: 'python,node'
- uses: actions/checkout@v2
with:
ref: develop
fetch-depth: 0 # fetch whole repo so git-restore-mtime can work
- name: Adjust file watchers limit
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
- name: Cleanup disk
uses: curoky/[email protected]
with:
retain: "python,node"
- uses: actions/checkout@v2
with:
ref: develop
fetch-depth: 0 # fetch whole repo so git-restore-mtime can work
- name: Adjust file watchers limit
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- uses: actions/setup-node@v1
with:
node-version: '14.x'
- name: Install yarn
run: sudo npm -g install yarn
- name: Yarn install
run: yarn install --immutable
env:
NODE_ENV: ${{ secrets.NODE_ENV }}
- uses: actions/setup-node@v1
with:
node-version: "14.x"
- name: Install yarn
run: sudo npm -g install yarn
- name: Yarn install
run: yarn install --immutable
env:
NODE_ENV: ${{ secrets.NODE_ENV }}

- name: Checking Gatsby cache
id: gatsby-cache-build
uses: actions/cache@v2
with:
path: |
public
.cache
key: ${{ runner.os }}-gatsby-build-develop-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-gatsby-build-develop-
- name: Checking Gatsby cache
id: gatsby-cache-build
uses: actions/cache@v2
with:
path: |
public
.cache
key: ${{ runner.os }}-gatsby-build-develop-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-gatsby-build-develop-
- name: Fix mtimes
run: yarn fix-mtimes --force
- name: Gatsby build
run: yarn build
env:
APP_ENV: staging
NODE_ENV: ${{ secrets.NODE_ENV }}
NODE_OPTIONS: --max-old-space-size=4096
ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_INDEX_NAME: edb-docs-staging
INDEX_ON_BUILD: true
- name: Fix mtimes
run: yarn fix-mtimes --force
- name: Gatsby build
run: yarn build
env:
APP_ENV: staging
NODE_ENV: ${{ secrets.NODE_ENV }}
NODE_OPTIONS: --max-old-space-size=4096
ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_INDEX_NAME: edb-docs-staging
INDEX_ON_BUILD: true

- name: Netlify deploy
run: |
sudo yarn global add netlify-cli
netlify deploy --dir=public --prod
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEVELOP_SITE_ID }}
- name: Netlify deploy
run: |
sudo yarn global add netlify-cli
netlify deploy --dir=public --prod
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEVELOP_SITE_ID }}

- uses: act10ns/slack@v1
with:
status: ${{ job.status }}
if: failure()
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
- uses: act10ns/slack@v1
with:
status: ${{ job.status }}
if: failure()
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
Loading

0 comments on commit 46cb395

Please sign in to comment.