From 16d5f04105f005bf59fc6278a284262f59d4199e Mon Sep 17 00:00:00 2001 From: bmorelli25 Date: Thu, 24 Mar 2022 15:46:17 -0700 Subject: [PATCH 1/3] docs: add `apm-aws-lambda` as a dependency --- conf.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/conf.yaml b/conf.yaml index 3c0ee99f99a9e..e9c1a15bb97f3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1321,6 +1321,11 @@ contents: repo: apm-agent-java path: CHANGELOG.asciidoc exclude_branches: [ 0.7, 0.6] + - + repo: apm-aws-lambda + path: docs + exclude_branches: [ 0.7, 0.6 ] + map_branches: *mapMasterToMain - title: APM .NET Agent prefix: dotnet current: 1.12 @@ -1354,6 +1359,11 @@ contents: repo: apm-agent-nodejs path: CHANGELOG.asciidoc exclude_branches: [ 1.x, 0.x ] + - + repo: apm-aws-lambda + path: docs + exclude_branches: [ 2.x, 1.x, 0.x ] + map_branches: *mapMasterToMain - title: APM PHP Agent prefix: php current: 1.x @@ -1387,6 +1397,11 @@ contents: repo: apm-agent-python path: CHANGELOG.asciidoc exclude_branches: [ 4.x, 3.x, 2.x, 1.x ] + - + repo: apm-aws-lambda + path: docs + exclude_branches: [ 5.x, 4.x, 3.x, 2.x, 1.x ] + map_branches: *mapMasterToMain - title: APM Ruby Agent prefix: ruby current: 4.x From 0da630e71314c7e1857a42bdcda5c1ea411fc63f Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 28 Mar 2022 13:54:58 -0700 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Greg Back <1045796+gtback@users.noreply.github.com> --- conf.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index e9c1a15bb97f3..e42ca5e95aec3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1325,7 +1325,8 @@ contents: repo: apm-aws-lambda path: docs exclude_branches: [ 0.7, 0.6 ] - map_branches: *mapMasterToMain + map_branches: + 1.x: *stackcurrent - title: APM .NET Agent prefix: dotnet current: 1.12 @@ -1363,7 +1364,8 @@ contents: repo: apm-aws-lambda path: docs exclude_branches: [ 2.x, 1.x, 0.x ] - map_branches: *mapMasterToMain + map_branches: + 3.x: *stackcurrent - title: APM PHP Agent prefix: php current: 1.x @@ -1401,7 +1403,8 @@ contents: repo: apm-aws-lambda path: docs exclude_branches: [ 5.x, 4.x, 3.x, 2.x, 1.x ] - map_branches: *mapMasterToMain + map_branches: + 6.x: *stackcurrent - title: APM Ruby Agent prefix: ruby current: 4.x From 0c060f79b1ac5825e77d3c22d3810b3473b8ddeb Mon Sep 17 00:00:00 2001 From: bmorelli25 Date: Mon, 28 Mar 2022 14:46:29 -0700 Subject: [PATCH 3/3] update build aliases too --- doc_build_aliases.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 87a9c6843c1cb..6c0b189b0993b 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -160,13 +160,13 @@ alias docbldidg='$GIT_HOME/docs/build_docs --doc $GIT_HOME/observability-docs/do alias docbldapm=' $GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-server/docs/integrations-index.asciidoc --resource=$GIT_HOME/observability-docs/ --resource=$GIT_HOME/apm-aws-lambda --chunk 2 --open' # APM Agents -alias docbldamn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-nodejs/docs/index.asciidoc --chunk 1' +alias docbldamn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-nodejs/docs/index.asciidoc --chunk 1 --resource $GIT_HOME/apm-aws-lambda/docs' -alias docbldamp='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-python/docs/index.asciidoc --chunk 1' +alias docbldamp='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-python/docs/index.asciidoc --chunk 1 --resource $GIT_HOME/apm-aws-lambda/docs' alias docbldamry='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-ruby/docs/index.asciidoc --chunk 1' -alias docbldamj='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-java/docs/index.asciidoc --chunk 1' +alias docbldamj='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-java/docs/index.asciidoc --chunk 1 --resource $GIT_HOME/apm-aws-lambda/docs' alias docbldamjs='$GIT_HOME/docs/build_docs --doc $GIT_HOME/apm-agent-rum-js/docs/index.asciidoc --chunk 1'