Skip to content

Commit 27c97f4

Browse files
committed
merge from remote main
2 parents 171b53f + 0d86d6d commit 27c97f4

Some content is hidden

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

42 files changed

+2736
-1338
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
jobs:
2323
lint:
2424
name: Lint
25-
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v11.0.1
25+
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v12.6.2
2626

2727
unit-test:
2828
name: Unit test charm
@@ -42,7 +42,7 @@ jobs:
4242

4343
build:
4444
name: Build charm
45-
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v11.0.1
45+
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v12.6.2
4646
with:
4747
cache: true
4848

@@ -61,7 +61,7 @@ jobs:
6161
- lint
6262
- unit-test
6363
- build
64-
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v11.0.1
64+
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v12.6.2
6565
with:
6666
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
6767
cloud: lxd

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424

2525
build:
2626
name: Build charm
27-
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v11.0.1
27+
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v12.6.2
2828

2929
release:
3030
name: Release charm
3131
needs:
3232
- ci-tests
3333
- build
34-
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v11.0.1
34+
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v12.6.2
3535
with:
3636
channel: 14/edge
3737
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}

.github/workflows/sync_issue_to_jira.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
sync:
1111
name: Sync GitHub issue to Jira
12-
uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v11.0.1
12+
uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v12.6.2
1313
with:
1414
jira-base-url: https://warthogs.atlassian.net
1515
jira-project-key: DPE

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Charmed PostgreSQL VM Operator
2+
[![CharmHub Badge](https://charmhub.io/postgresql/badge.svg)](https://charmhub.io/postgresql)
3+
[![Release](https://github.com/canonical/postgresql-operator/actions/workflows/release.yaml/badge.svg)](https://github.com/canonical/postgresql-operator/actions/workflows/release.yaml)
4+
[![Tests](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml?query=branch%3Amain)
25

36
## Description
47

charmcraft.yaml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
type: charm
55
bases:
6-
- build-on:
7-
- name: "ubuntu"
8-
channel: "22.04"
9-
run-on:
10-
- name: "ubuntu"
11-
channel: "22.04"
6+
- name: ubuntu
7+
channel: "22.04"
8+
architectures: [amd64]
9+
- name: ubuntu
10+
channel: "22.04"
11+
architectures: [arm64]
1212
parts:
1313
charm:
1414
override-pull: |
@@ -24,6 +24,15 @@ parts:
2424
- rustc
2525
- cargo
2626
- pkg-config
27+
- libpq-dev
2728
charm-strict-dependencies: true
28-
charm-binary-python-packages:
29-
- psycopg2-binary
29+
libpq:
30+
build-packages:
31+
- libpq-dev
32+
plugin: dump
33+
source: /usr/lib/
34+
source-type: local
35+
prime:
36+
- lib/
37+
organize:
38+
"*-linux-gnu/libpq.so*": lib/

0 commit comments

Comments
 (0)