Skip to content

Commit

Permalink
Merge branch 'main' into renovate/node-22.x
Browse files Browse the repository at this point in the history
  • Loading branch information
arturo-seijas authored Jan 8, 2025
2 parents e93cf3e + dbbda3a commit 59ebcfc
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/allure_report.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Allure Report Generation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_update_charm_libs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Auto-update Charm Libraries
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bot_pr_approval.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Provide approval for bot PRs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Comment on the pull request
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment_contributing.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Comment on the pull request
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Integration tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_test_run.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Run integration tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jira.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

# this workflow requires to provide JIRA webhook URL via JIRA_URL GitHub Secret
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_from_template_files.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote_charm.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Promote charm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_charm.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Publish charm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_bot_pr_approval.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Provide approval for bot PRs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Canonical Ltd.
# Copyright 2025 Canonical Ltd.
# See LICENSE file for licensing details.

name: Workflow test
Expand Down
4 changes: 2 additions & 2 deletions docs/how-to/integration_test_allure.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# How to set up Allure Reports for integration tests

This how-to guide describes how to integrate [Allure Reports](https://allurereport.org/) into your code repository's [integration_test_run.yaml](https://github.com/canonical/operator-workflows?tab=readme-ov-file#integration-test-workflow-canonicaloperator-workflowsgithubworkflowsintegration_testyamlmain).
This how-to guide describes how to integrate [Allure Reports](https://allurereport.org/) into your code repository's [integration_test.yaml](https://github.com/canonical/operator-workflows?tab=readme-ov-file#integration-test-workflow-canonicaloperator-workflowsgithubworkflowsintegration_testyamlmain).

## Adding allure-pytest and pytest collection plugin

Expand All @@ -13,7 +13,7 @@ allure-pytest>=2.8.18
Add the following line under the dependencies (`deps`) in the integration section inside `tox.ini`:

```
git+https://github.com/canonical/operator-workflows@main\#subdirectory=python/pytest_plugins/allure_pytest_collection_report
git+https://github.com/canonical/data-platform-workflows@v24.0.0\#subdirectory=python/pytest_plugins/allure_pytest_collection_report
```

## Calling the allure-workflow
Expand Down
2 changes: 1 addition & 1 deletion src/build.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

import * as core from '@actions/core'
Expand Down
2 changes: 1 addition & 1 deletion src/model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

export interface Plan {
Expand Down
2 changes: 1 addition & 1 deletion src/plan-integration.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

import * as core from '@actions/core'
Expand Down
2 changes: 1 addition & 1 deletion src/plan-scan.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

import * as core from '@actions/core'
Expand Down
2 changes: 1 addition & 1 deletion src/plan.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

import * as core from '@actions/core'
Expand Down
2 changes: 1 addition & 1 deletion src/publish.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Canonical Ltd.
// Copyright 2025 Canonical Ltd.
// See LICENSE file for licensing details.

import * as core from '@actions/core'
Expand Down

0 comments on commit 59ebcfc

Please sign in to comment.