Skip to content

Commit

Permalink
Merge branch 'main' into moved-content
Browse files Browse the repository at this point in the history
  • Loading branch information
colleenmcginnis committed Aug 5, 2024
2 parents ba33517 + ab343b7 commit b2104c3
Show file tree
Hide file tree
Showing 666 changed files with 28,814 additions and 913 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
# For more info, see https://help.github.com/articles/about-codeowners/

* @elastic/obs-docs
/.github/workflows/co-docs-builder.yml @elastic/docs-engineering
2 changes: 0 additions & 2 deletions .github/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ BACKPORT_BRANCH_NAME = add-backport-next-$(NEXT_PROJECT_MINOR_VERSION)
##############################
## observability-docs specific
##############################
PROJECT_REVIEWERS ?= elastic/obs-docs

##############################
## public make goals
Expand Down Expand Up @@ -86,7 +85,6 @@ create-prs-next-release:
gh pr create \
--title "backport: Add backport-$(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION) label" \
--body "Merge as soon as $(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION) branch was created." \
--reviewer "$(PROJECT_REVIEWERS)" \
--base main \
--label 'Team:Automation' || echo "There are no changes"

Expand Down
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
version: 2
updates:

# GitHub actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "22:00"
reviewers:
- "elastic/observablt-ci"
groups:
github-actions:
patterns:
- "*"
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/en/serverless/**.mdx'
- 'docs/en/serverless/**.docnav.json'
- 'docs/en/serverless/**.docapi.json'
- 'docs/en/serverless/**.devdocs.json'
- 'docs/en/serverless/**.jpg'
- 'docs/en/serverless/**.jpeg'
- 'docs/en/serverless/**.svg'
- 'docs/en/serverless/**.png'
- 'docs/en/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 }}
36 changes: 36 additions & 0 deletions .github/workflows/delete-serverless-dir-on-backports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
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/en/serverless directory
id: check_serverless
run: |
if [ -d "docs/en/serverless" ]; then
echo "SERVERLESS_EXISTS=true" >> $GITHUB_ENV
else
echo "SERVERLESS_EXISTS=false" >> $GITHUB_ENV
fi
- name: Delete docs/en/serverless directory if it exists
if: env.SERVERLESS_EXISTS == 'true'
run: |
rm -rf docs/en/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/en/serverless directory"
git pull origin ${{ github.head_ref }}
git push origin HEAD:${{ github.head_ref }}
4 changes: 2 additions & 2 deletions .github/workflows/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Parse issue form
uses: stefanbuck/github-issue-parser@v3
Expand All @@ -25,7 +25,7 @@ jobs:
template-path: .github/ISSUE_TEMPLATE/elastic-request.yaml

- name: Set labels based on issue field
uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
uses: redhat-plumbers-in-action/advanced-issue-labeler@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
issue-form: ${{ steps.issue-parser.outputs.jsonString }}
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/opentelemetry.yml

This file was deleted.

8 changes: 3 additions & 5 deletions .github/workflows/run-minor-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ jobs:
GH_TOKEN: ${{ github.token }}

- if: ${{ failure() }}
uses: elastic/apm-pipeline-library/.github/actions/slack-message@current
uses: elastic/oblt-actions/slack/send@v1
with:
url: ${{ secrets.VAULT_ADDR }}
roleId: ${{ secrets.VAULT_ROLE_ID }}
secretId: ${{ secrets.VAULT_SECRET_ID }}
channel: '#observablt-bots'
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
channel-id: '#observablt-bots'
message: ":traffic_cone: release automation failed for `${{ github.repository }}@${{ inputs.version }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
Loading

0 comments on commit b2104c3

Please sign in to comment.