Skip to content

Commit ba46d7b

Browse files
cbartzcbartz
authored
Merge branch 'canonical:main' into main
2 parents dbde83a + 33fceee commit ba46d7b

131 files changed

Lines changed: 150 additions & 138 deletions

File tree

Some content is hidden

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

‎.github/workflows/e2e_test_run.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Canonical Ltd.
1+
# Copyright 2025 Canonical Ltd.
22
# See LICENSE file for licensing details.
33

44
name: Run End-to-End test

‎.github/workflows/integration_test.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: integration-tests
22

33
on:
44
pull_request:
5-
schedule:
6-
# Trigger at 6:00 AM and 6:00 PM UTC
7-
- cron: "0 6,18 * * *"
5+
6+
# Disabled until we get more resources for the actions
7+
# schedule:
8+
# # Trigger at 6:00 AM and 6:00 PM UTC
9+
# - cron: "0 6,18 * * *"
810

911
concurrency:
1012
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

‎.github/workflows/workflow_dispatch_ssh_debug.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
runs-on: [self-hosted, linux, "${{ inputs.runner }}"]
1414
steps:
1515
- name: Setup tmate session
16-
uses: canonical/action-tmate@chore/env_var_change
16+
uses: canonical/action-tmate@main
1717
timeout-minutes: 5

‎SECURITY.md‎

Lines changed: 3 additions & 0 deletions

‎actions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Canonical Ltd.
1+
# Copyright 2025 Canonical Ltd.
22
# See LICENSE file for licensing details.
33

44
check-runners:

‎charmcraft.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Canonical Ltd.
1+
# Copyright 2025 Canonical Ltd.
22
# See LICENSE file for licensing details.
33

44
type: charm

‎config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Canonical Ltd.
1+
# Copyright 2025 Canonical Ltd.
22
# See LICENSE file for licensing details.
33

44
options:

‎generate-src-docs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2024 Canonical Ltd.
3+
# Copyright 2025 Canonical Ltd.
44
# See LICENSE file for licensing details.
55

66
lazydocs --no-watermark --output-path src-docs src/*.py

‎github-runner-manager/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright 2024 Canonical Ltd.
190+
Copyright 2025 Canonical Ltd.
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

‎github-runner-manager/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Canonical Ltd.
1+
# Copyright 2025 Canonical Ltd.
22
# See LICENSE file for licensing details.
33

44
[project]

0 commit comments

Comments
 (0)