Skip to content

Commit

Permalink
Merge branch 'main' into 5029-max_signals-editable-classic
Browse files Browse the repository at this point in the history
  • Loading branch information
joepeeples authored Jul 3, 2024
2 parents 7281506 + 50c3806 commit 32ff5d3
Show file tree
Hide file tree
Showing 654 changed files with 18,554 additions and 349 deletions.
2 changes: 1 addition & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"upstream": "elastic/security-docs",
"branches": [{ "name": "7.x", "checked": true }, "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "7.16", "7.15", "7.14", "7.13", "7.12", "7.11", "7.10", "7.9", "7.8"],
"branches": [{ "name": "7.x", "checked": true }, "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "7.16", "7.15", "7.14", "7.13", "7.12", "7.11", "7.10", "7.9", "7.8"],
"labels": ["backport"]
}
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @elastic/security-docs
/.github/workflows/co-docs-builder.yml @elastic/docs-engineering
36 changes: 36 additions & 0 deletions .github/workflows/co-docs-builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Elastic docs

on:
pull_request_target:
# The paths property can be omitted entirely if the repo is mainly used for docs. Leaving it in can result in builds that
# have branch protection checks in place lose the ability to merge because the workflow is not starting. If this property
# is included, please ensure that branch protection checks are disabled for the repo.
paths:
# Preface with your docs dir if you need further specificity (optional)
- 'docs/serverless/**.mdx'
- 'docs/serverless/**.docnav.json'
- 'docs/serverless/**.docapi.json'
- 'docs/serverless/**.devdocs.json'
- 'docs/serverless/**.jpg'
- 'docs/serverless/**.jpeg'
- 'docs/serverless/**.svg'
- 'docs/serverless/**.png'
- 'docs/serverless/**.gif'
types: [closed, opened, synchronize, labeled]

jobs:
publish:
if: contains(github.event.pull_request.labels.*.name, 'ci:doc-build')
uses: elastic/workflows/.github/workflows/docs-versioned-publish.yml@main
with:
# Refers to Vercel project
project-name: elastic-dot-co-docs-preview-docs
# Which prebuild step (dev or not)
prebuild: wordlake-docs
# Docsmobile project dir
site-repo: docs-site
secrets:
VERCEL_GITHUB_TOKEN: ${{ secrets.VERCEL_GITHUB_TOKEN_PUBLIC }}
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN_PUBLIC }}
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID_PUBLIC }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_ELASTIC_DOT_CO_DOCS_PRODUCTION_PUBLIC }}
35 changes: 35 additions & 0 deletions .github/workflows/delete-serverless-dir-in-backports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Delete serverless directory in backports

on:
pull_request:
branches:
- '7.*'
- '8.*'

jobs:
check-and-delete-serverless:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Check for existence of docs/serverless directory
id: check_serverless
run: |
if [ -d "docs/serverless" ]; then
echo "SERVERLESS_EXISTS=true" >> $GITHUB_ENV
else
echo "SERVERLESS_EXISTS=false" >> $GITHUB_ENV
fi
- name: Delete docs/serverless directory if it exists
if: env.SERVERLESS_EXISTS == 'true'
run: |
rm -rf docs/serverless
git config pull.rebase true
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git add .
git commit -m "Delete docs/serverless directory and its contents"
git pull origin ${{ github.head_ref }}
git push origin HEAD:${{ github.head_ref }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
docs/html_docs
/html_docs
.vscode/
.vs/
14 changes: 14 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ pull_request_rules:
git merge upstream/{{base}}
git push upstream {{head}}
```
- name: backport patches to 8.15 branch
conditions:
- merged
- base=main
- label=v8.15.0
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "8.15"
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
labels:
- backport
- name: backport patches to 8.14 branch
conditions:
- merged
Expand Down
Loading

0 comments on commit 32ff5d3

Please sign in to comment.