Skip to content

Commit 05d628e

Browse files
authored
Merge pull request #37 from Telefonica/release
Release v2.1.1
2 parents 287ce0b + 8086085 commit 05d628e

File tree

15 files changed

+158
-164
lines changed

15 files changed

+158
-164
lines changed

.github/actions/setup-node/action.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ runs:
1919
with:
2020
node-version-file: .node-version
2121
cache: pnpm
22-
- uses: DamianReeves/write-file-action@v1.3
23-
with:
24-
path: .npmrc
25-
contents: |
26-
@tid-xcut:registry=https://nexus.tid.es/repository/npm-xcut-components/
27-
//nexus.tid.es/repository/npm-xcut-components/:_auth=${{ inputs.npm-token }}
28-
write-mode: append
2922
- name: Install Node.js dependencies
3023
shell: bash
3124
run: pnpm install

.github/check-license-compliance.config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,3 @@ licenses:
3838
- GPL-3.0-only
3939
- GPL-3.0-or-later
4040
- AGPL-3.0
41-
npm:
42-
excludeModules:
43-
# The following packages are in a private repository
44-
- nameMatch: "@tid-xcut\/.*"
45-
ignore: true

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
22
# SPDX-License-Identifier: MIT
33

4-
name: Continuous Integration
4+
name: Build
55

66
on:
77
pull_request:
@@ -25,8 +25,6 @@ jobs:
2525

2626
- uses: ./.github/actions/setup-node
2727
id: setup-node
28-
with:
29-
npm-token: ${{ secrets.NPM_TOKEN_XCUT }}
3028

3129
- name: Build
3230
id: build

.github/workflows/contributor-license-agreement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
path-to-signatures: 'signatures/version1/cla.json'
3333
create-file-commit-message: 'Creating file for storing CLA Signatures'
3434
signed-commit-message: '$contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
35-
path-to-document: 'https://github.com/Telefonica/cross-confluence-tools/blob/master/.github/CLA.md'
35+
path-to-document: 'https://github.com/Telefonica/markdown-confluence-sync-action/blob/master/.github/CLA.md'
3636
branch: 'cla-signatures'
3737
# the below is the list of users who are allowed to sign the CLA without any check
3838
allowlist: renovate,renovate[bot]

.github/workflows/test-e2e.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
[
3535
{
3636
"path": "README.md",
37-
"id": "${{ vars.CONFLUENCE_README_PAGE_ID }}",
37+
"id": "${{ secrets.CONFLUENCE_README_PAGE_ID }}",
3838
"title": "[Cross] [Markdown Confluence Sync] Github action"
3939
},
4040
{
4141
"path": "CHANGELOG.md",
42-
"id": "${{ vars.CONFLUENCE_CHANGELOG_PAGE_ID }}",
42+
"id": "${{ secrets.CONFLUENCE_CHANGELOG_PAGE_ID }}",
4343
"title": "[Cross] [Markdown Confluence Sync] [Github action] Releases"
4444
}
4545
]
46-
confluence-url: ${{ vars.CONFLUENCE_URL }}
47-
confluence-space-key: ${{ vars.CONFLUENCE_SPACE_KEY }}
46+
confluence-url: ${{ secrets.CONFLUENCE_URL }}
47+
confluence-space-key: ${{ secrets.CONFLUENCE_SPACE_KEY }}
4848
confluence-personal-access-token: ${{ secrets.CONFLUENCE_PAT }}
4949
log-level: debug
5050

@@ -61,13 +61,11 @@ jobs:
6161

6262
- uses: ./.github/actions/setup-node
6363
id: setup-node
64-
with:
65-
npm-token: ${{ secrets.NPM_TOKEN_XCUT }}
6664

6765
- name: Run E2E Tests
6866
run: npm run test:e2e
6967
env:
70-
CONFLUENCE_URL: ${{ vars.CONFLUENCE_URL }}
68+
CONFLUENCE_URL: ${{ secrets.CONFLUENCE_URL }}
7169
CONFLUENCE_PAT: ${{ secrets.CONFLUENCE_PAT }}
72-
CONFLUENCE_README_PAGE_ID: ${{ vars.CONFLUENCE_README_PAGE_ID }}
73-
CONFLUENCE_CHANGELOG_PAGE_ID: ${{ vars.CONFLUENCE_CHANGELOG_PAGE_ID }}
70+
CONFLUENCE_README_PAGE_ID: ${{ secrets.CONFLUENCE_README_PAGE_ID }}
71+
CONFLUENCE_CHANGELOG_PAGE_ID: ${{ secrets.CONFLUENCE_CHANGELOG_PAGE_ID }}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
#### Deprecated
1212
#### Removed
1313

14+
## [2.1.1] - 2025-04-08
15+
16+
### Changed
17+
18+
* chore(deps): Remove @tid-xcut/markdown-confluence-sync dependency. Use @telefonica/markdown-confluence-sync instead. The library has been moved to the @telefonica organization in the public NPM registry.
19+
1420
## [2.1.0] - 2025-03-20
1521

1622
### Added

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
[![Build status](https://github.com/Telefonica/markdown-confluence-sync-action/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/Telefonica/markdown-confluence-sync-action/actions?query=workflow%3Abuild+branch%3Amain) [![Last commit](https://img.shields.io/github/last-commit/Telefonica/markdown-confluence-sync-action.svg)](https://github.com/Telefonica/markdown-confluence-sync-action/commits) [![Last release](https://img.shields.io/github/release-date/Telefonica/markdown-confluence-sync-action.svg)](https://github.com/Telefonica/markdown-confluence-sync-action/releases)
2+
13
# Markdown Confluence Sync action
24

3-
This action syncs markdown files to Confluence using the [Markdown Confluence Sync](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync) library.
5+
This action syncs markdown files to Confluence using the [Markdown Confluence Sync](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync) library.
46

57
## Table of contents
68

@@ -31,7 +33,7 @@ This action syncs markdown files to Confluence using the [Markdown Confluence Sy
3133
* **flat**: Synchronize a list of markdown files matched by a [glob pattern](https://github.com/isaacs/node-glob#glob-primer) as children page of a Confluence root page, without any hierarchy. It is also possible to provide a Confluence id to some pages to update them directly, as in the id mode.
3234

3335
> [!NOTE]
34-
> Read the [Markdown Confluence Sync library documentation](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync) for detailed information about all features and configuration options.
36+
> Read the [Markdown Confluence Sync library documentation](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync) for detailed information about all features and configuration options.
3537
3638
## Usage
3739

@@ -74,7 +76,7 @@ docs/
7476
```
7577
7678
> [!TIP]
77-
> Read the [tree mode docs](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync#tree-mode) for further information about configuration options and how to organize your markdown files.
79+
> Read the [tree mode docs](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync#tree-mode) for further information about configuration options and how to organize your markdown files.
7880
7981
### Id operation mode
8082
@@ -177,7 +179,7 @@ The action accepts a configuration file in the root of the repository, and it ca
177179
|------|-------------|----------|---------|
178180
| `mode` | Operation mode: `tree`, `id` or `flat` | No | `tree` |
179181
| `docs-dir` | Path to the directory containing the markdown files | __Yes__ | |
180-
| `files-metadata` | Array of objects with the metadata of the files to sync, expressed as an stringified JSON (supports multiline). Each object must have at least the `path` property for identifying the file. For the rest of properties read the [markdown-confluence-sync docs](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync#filesmetadata-property) | No | |
182+
| `files-metadata` | Array of objects with the metadata of the files to sync, expressed as an stringified JSON (supports multiline). Each object must have at least the `path` property for identifying the file. For the rest of properties read the [markdown-confluence-sync docs](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync#filesmetadata-property) | No | |
181183
| `files-pattern` | Pattern to filter the files to sync in flat or id mode | No | |
182184
| `ignore`| Semicolon separated list of [glob](https://github.com/cowboy/node-globule) patterns to ignore files. Matches are based on the current working directory | No | |
183185
| `confluence-url` | Confluence base URL | __Yes__ | |
@@ -192,7 +194,7 @@ The action accepts a configuration file in the root of the repository, and it ca
192194
| `cwd` | Current working directory. Path from where resolve `docs-dir`, `files-pattern`, `ignore`, and search for the configuration file. It must be relative to the repository folder | No | Repository root (`.`) |
193195

194196
> [!NOTE]
195-
> Some markdown-confluence-sync options are not available as inputs in the action, as `preprocessor`. If you need to use them, you can set them in the [configuration file](#configuration-file) or using [environment variables](#environment-variables). Refer to the [Markdown Confluence Sync library docs](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync#configuration-file) for further info about all available options.
197+
> Some markdown-confluence-sync options are not available as inputs in the action, as `preprocessor`. If you need to use them, you can set them in the [configuration file](#configuration-file) or using [environment variables](#environment-variables). Refer to the [Markdown Confluence Sync library docs](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync#configuration-file) for further info about all available options.
196198
197199
### Configuration file
198200

@@ -217,13 +219,13 @@ module.exports = {
217219
```
218220

219221
> [!NOTE]
220-
> Read the [Markdown Confluence Sync library docs](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync#configuration-file) for further info about the configuration file.
222+
> Read the [Markdown Confluence Sync library docs](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync#configuration-file) for further info about the configuration file.
221223
222224
### Environment variables
223225

224226
The action can be configured using environment variables. The environment variables must be prefixed with `MARKDOWN_CONFLUENCE_SYNC_` and use uppercase letters.
225227

226-
Read the [Markdown Confluence Sync library docs](https://github.com/Telefonica/cross-confluence-tools/tree/main/components/markdown-confluence-sync#environment-variables) for further info about environment variables.
228+
Read the [Markdown Confluence Sync library docs](https://github.com/Telefonica/confluence-tools/tree/main/components/markdown-confluence-sync#environment-variables) for further info about environment variables.
227229

228230
## Contributing
229231

0 commit comments

Comments
 (0)