Skip to content

Commit e3df392

Browse files
Merge pull request #800 from canonical/pg16-fixes
[DPE-6112] Sync main Merging two branches to avoid rebasing/squashing for long lasting huge branch.
2 parents 8f3c42a + ff76559 commit e3df392

26 files changed

+1390
-255
lines changed

.github/workflows/approve_renovate_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ on:
1010
jobs:
1111
approve-pr:
1212
name: Approve Renovate pull request
13-
uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v30.2.0
13+
uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v31.0.0
1414
permissions:
1515
pull-requests: write # Needed to approve PR

.github/workflows/check_pr.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ on:
1111
- edited
1212
branches:
1313
- main
14+
- '*/edge'
1415

1516
jobs:
1617
check-pr:
1718
name: Check pull request
18-
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v30.2.0
19+
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.0.0

.github/workflows/ci.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
jobs:
2828
lint:
2929
name: Lint
30-
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v30.2.0
30+
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v31.0.0
3131

3232
unit-test:
3333
name: Unit test charm
@@ -49,9 +49,7 @@ jobs:
4949

5050
build:
5151
name: Build charm
52-
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v30.2.0
53-
with:
54-
cache: false # TODO remove when 16/edge branch is set up
52+
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v31.0.0
5553

5654
integration-test:
5755
name: Integration test charm

.github/workflows/promote.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
promote:
2727
name: Promote charm
28-
uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v30.2.0
28+
uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v31.0.0
2929
with:
3030
track: '16'
3131
from-risk: ${{ inputs.from-risk }}

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Release charm
2828
needs:
2929
- ci-tests
30-
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v30.2.0
30+
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0
3131
with:
3232
channel: ${{ github.ref_name }}
3333
artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}

.github/workflows/sync_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
sync-docs:
1212
name: Sync docs from Discourse
13-
uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v30.2.0
13+
uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v31.0.0
1414
with:
1515
reviewers: a-velasco,izmalk
1616
permissions:

charmcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ parts:
2727
PIP_BREAK_SYSTEM_PACKAGES=true python3 -m pip install --user --upgrade pip==25.0.1 # renovate: charmcraft-pip-latest
2828
2929
# Use uv to install poetry so that a newer version of Python can be installed if needed by poetry
30-
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.5/uv-installer.sh | sh # renovate: charmcraft-uv-latest
30+
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.7/uv-installer.sh | sh # renovate: charmcraft-uv-latest
3131
# poetry 2.0.0 requires Python >=3.9
3232
if ! "$HOME/.local/bin/uv" python find '>=3.9'
3333
then

concierge.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ providers:
55
lxd:
66
enable: true
77
bootstrap: true
8+
channel: latest/stable
89
host:
910
snaps:
1011
jhack:

0 commit comments

Comments
 (0)