Skip to content

Commit

Permalink
Merge branch 'master' into may/remove-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
maycmlee authored Nov 4, 2024
2 parents 8b3705e + feea46c commit 17c3a49
Show file tree
Hide file tree
Showing 348 changed files with 25,945 additions and 8,314 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-28 10:24:44.676000",
"spec_repo_commit": "2e09a3ec"
"regenerated": "2024-10-31 16:43:05.483809",
"spec_repo_commit": "63c441b2"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-28 10:24:52.380008",
"spec_repo_commit": "2e09a3ec"
"regenerated": "2024-10-31 16:43:13.281471",
"spec_repo_commit": "63c441b2"
}
}
}
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ content/en/mobile_app_testing/*.md @Datadog/synthet
# Software Delivery

content/en/tests/ @Datadog/ci-app-libraries @Datadog/documentation
content/en/intelligent_test_runner/ @Datadog/ci-app-libraries @Datadog/documentation
content/en/tests/test_impact_analysis @Datadog/ci-app-libraries @Datadog/documentation
content/en/continuous_integration/ @Datadog/ci-app-backend @Datadog/documentation
content/en/continuous_delivery/ @Datadog/ci-app-backend @Datadog/documentation
content/en/dora_metrics/ @Datadog/ci-app-backend @Datadog/documentation
Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<!-- A brief description of the change being made with this pull request. What is your motivation for the PR? -->

### Merge instructions
<!-- If you want us to merge this PR as soon as we've reviewed, check the box below. If you're waiting for a release or there are other considerations that you want us to be aware of, list them below. -->

<!-- If you're waiting for a release or there are other considerations that you want us to be aware of, list them here. -->

Merge queue is enabled in this repo. To have it automatically merged after it receives the required reviews, create the PR (from a branch that follows the `<yourname>/description` naming convention) and then add the following PR comment:

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/gif_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ concurrency:

jobs:
look-for-gifs:
permissions:
contents: read

if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ on: [pull_request]

jobs:
label:
permissions:
pull-requests: write # to update pull request
contents: read # to read the contents of the repository
statuses: write # to set the status of the commit

runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
Expand Down
104 changes: 52 additions & 52 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ stages:
- post-deploy
- cleanup

# set pipeline type for merge queue
# set pipeline type for merge queue
workflow:
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
Expand Down Expand Up @@ -120,7 +120,7 @@ before_script:
# ==================== rules ==================== #
.preview_rules: &preview_rules
rules:
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ $PREVIEW_PATTERN
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ $PREVIEW_PATTERN
when: on_success

.if_mergequeue: &if_mergequeue
Expand Down Expand Up @@ -257,38 +257,38 @@ missing_tms_preview:
- check_missing_tms
interruptible: true

algolia_sync_preview:manual:
<<: *base_template
stage: post-deploy
environment: "preview"
allow_failure: true
interruptible: true
timeout: 2h
cache:
- *hugo_cache
- *yarn_cache
- *pip_cache
dependencies:
- build_preview
script:
# build the site to get algolia.json ondemand
- touch Makefile.config preview_error.log
- make dependencies
- make config
- yarn run prebuild
- build_site
# end build
- yarn add atomic-algolia@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/atomic-algolia-v1.0.2.tgz
- >
ALGOLIA_APP_ID=$(get_secret 'algolia_preview_application_id')
ALGOLIA_ADMIN_KEY=$(get_secret 'algolia_preview_api_key')
CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE
yarn run algolia:sync
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: never
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG =~ "/^$/"'
when: manual
# algolia_sync_preview:manual:
# <<: *base_template
# stage: post-deploy
# environment: "preview"
# allow_failure: true
# interruptible: true
# timeout: 2h
# cache:
# - *hugo_cache
# - *yarn_cache
# - *pip_cache
# dependencies:
# - build_preview
# script:
# # build the site to get algolia.json ondemand
# - touch Makefile.config preview_error.log
# - make dependencies
# - make config
# - yarn run prebuild
# - build_site
# # end build
# - yarn add atomic-algolia@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/atomic-algolia-v1.0.2.tgz
# - >
# ALGOLIA_APP_ID=$(get_secret 'algolia_preview_application_id')
# ALGOLIA_ADMIN_KEY=$(get_secret 'algolia_preview_api_key')
# CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE
# yarn run algolia:sync
# rules:
# - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
# when: never
# - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG =~ "/^$/"'
# when: manual

typesense_sync_preview:manual:
<<: *base_template
Expand Down Expand Up @@ -321,23 +321,23 @@ typesense_sync_preview:manual:
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG =~ "/^$/"'
when: manual

algolia_sync_live:
<<: *base_template
<<: *live_rules
stage: post-deploy
environment: "live"
allow_failure: true
interruptible: true
timeout: 2h
dependencies:
- build_live
script:
- yarn add atomic-algolia@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/atomic-algolia-v1.0.2.tgz
- >
ALGOLIA_APP_ID=$(get_secret 'algolia_docsearch_application_id')
ALGOLIA_ADMIN_KEY=$(get_secret 'algolia_docsearch_api_key')
CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE
yarn run algolia:sync
# algolia_sync_live:
# <<: *base_template
# <<: *live_rules
# stage: post-deploy
# environment: "live"
# allow_failure: true
# interruptible: true
# timeout: 2h
# dependencies:
# - build_live
# script:
# - yarn add atomic-algolia@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/atomic-algolia-v1.0.2.tgz
# - >
# ALGOLIA_APP_ID=$(get_secret 'algolia_docsearch_application_id')
# ALGOLIA_ADMIN_KEY=$(get_secret 'algolia_docsearch_api_key')
# CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE
# yarn run algolia:sync

typesense_sync_live:
<<: *base_template
Expand All @@ -350,7 +350,7 @@ typesense_sync_live:
dependencies:
- build_live
script:
- yarn add typesense-sync@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/typesense-sync-v1.0.4.tgz
- yarn add typesense-sync@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/typesense-sync-v1.0.7.tgz
- >
TYPESENSE_ADMIN_API_KEY=$(get_secret 'typesense_prod_admin_api_key')
TYPESENSE_HOST=$(get_secret 'typesense_prod_host')
Expand Down
2 changes: 1 addition & 1 deletion assets/scripts/components/async-loading.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { initializeGroupedListings } from './grouped-item-listings';
import {updateMainContentAnchors, reloadWistiaVidScripts, gtag, getCookieByName } from '../helpers/helpers';
import configDocs from '../config/config-docs';
import { redirectCodeLang, addCodeTabEventListeners, addCodeBlockVisibilityToggleEventListeners, activateCodeLangNav, toggleMultiCodeLangNav } from './code-languages'; // eslint-disable-line import/no-cycle
import { loadInstantSearch } from './algolia';
import { loadInstantSearch } from './instantsearch';

const { env } = document.documentElement.dataset;
const { gaTag } = configDocs[env];
Expand Down
Loading

0 comments on commit 17c3a49

Please sign in to comment.