Skip to content

Commit b0d71cd

Browse files
committed
Merge branch 'feature/v3' into tvaleev/feature/RUM-9899_2
# Conflicts: # detekt_custom.yml
2 parents bcf31ca + ab7d8b8 commit b0d71cd

File tree

377 files changed

+10282
-1623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+10282
-1623
lines changed

.github/workflows/changelog-to-confluence.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
- name: Prepare Only Changelog
1818
run: |
1919
mkdir -p publish_folder
20-
cp CHANGELOG.md publish_folder/
20+
cp CHANGELOG.md publish_folder/android-sdk-changelog.md
2121
echo "Publishing only CHANGELOG.md"
2222
2323
- name: Publish Markdown to Confluence
2424
uses: markdown-confluence/publish-action@7767a0a7f438bb1497ee7ffd7d3d685b81dfe700 # v5
2525
with:
26-
confluenceBaseUrl: ${{ secrets.CONFLUENCE_BASE_URL }}
26+
confluenceBaseUrl: ${{ secrets.DATADOG_CONFLUENCE_BASE_URL }}
2727
confluenceParentId: ${{ secrets.CONFLUENCE_PARENT_ID }}
28-
atlassianUserName: ${{ secrets.ATLASSIAN_USERNAME }}
29-
atlassianApiToken: ${{ secrets.ATLASSIAN_API_TOKEN }}
28+
atlassianUserName: ${{ secrets.CONFLUENCE_ROBOT_RUM_EMAIL }}
29+
atlassianApiToken: ${{ secrets.CONFLUENCE_ROBOT_RUM_API_KEY }}
3030
contentRoot: '.'
3131
folderToPublish: 'publish_folder'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ config/*
2929
# Kotlin
3030
.kotlin/
3131

32+
# dd-sdk-android tools
3233
gh_token
3334
sdk_classpath
3435
detekt_classpath
36+
**/verification-metadata.xml
37+
!gradle/verification-metadata.xml

0 commit comments

Comments
 (0)