Skip to content

Commit 177347c

Browse files
[DPE-7802] Update MySQL to 8.0.42 & add s390x arch (#636)
Since there are only 3 IS-hosted s390x github runners, will add s390x integration tests in a separate PR to avoid blocking PRs
1 parent 25969a6 commit 177347c

File tree

11 files changed

+18
-12
lines changed

11 files changed

+18
-12
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@v31.1.1
13+
uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v32.2.0
1414
permissions:
1515
pull-requests: write # Needed to approve PR

.github/workflows/check_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ on:
1515
jobs:
1616
check-pr:
1717
name: Check pull request
18-
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.1.1
18+
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v32.2.0

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
jobs:
2525
lint:
2626
name: Lint
27-
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v31.1.1
27+
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v32.2.0
2828

2929
unit-test:
3030
name: Unit test charm
@@ -44,7 +44,7 @@ jobs:
4444

4545
build:
4646
name: Build charm
47-
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v31.1.1
47+
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v32.2.0
4848

4949
integration-test:
5050
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/[email protected]
28+
uses: canonical/data-platform-workflows/.github/workflows/[email protected] # Use v32 after this charm adds refresh v3
2929
with:
3030
track: '8.0'
3131
from-risk: ${{ inputs.from-risk }}

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
needs:
4545
- lib-check
4646
- ci-tests
47-
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.1.1
47+
uses: canonical/data-platform-workflows/.github/workflows/release_charm_edge.yaml@v32.2.0
4848
with:
49-
channel: '8.0/edge'
49+
track: '8.0'
5050
artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}
5151
secrets:
5252
charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}

.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@v31.1.1
13+
uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v32.2.0
1414
with:
1515
reviewers: a-velasco
1616
permissions:

charmcraft.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ type: charm
55
platforms:
66
77
8+
89
# Files implicitly created by charmcraft without a part:
910
# - dispatch (https://github.com/canonical/charmcraft/pull/1898)
1011
# - manifest.yaml

lib/charms/mysql/v0/architecture.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ def is_wrong_architecture() -> bool:
8181
manifest_archs.extend(base_archs)
8282

8383
hardware_arch = platform.machine()
84-
if ("amd64" in manifest_archs and hardware_arch == "x86_64") or (
85-
"arm64" in manifest_archs and hardware_arch == "aarch64"
84+
if (
85+
("amd64" in manifest_archs and hardware_arch == "x86_64")
86+
or ("arm64" in manifest_archs and hardware_arch == "aarch64")
87+
or ("s390x" in manifest_archs and hardware_arch == "s390x")
8688
):
8789
logger.debug("Charm architecture matches")
8890
return False

metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resources:
3232
mysql-image:
3333
type: oci-image
3434
description: Ubuntu LTS Docker image for MySQL
35-
upstream-source: ghcr.io/canonical/charmed-mysql@sha256:089fc04dd2d6f1559161ddf4720c1e06559aeb731ecae57b050c9c816e9833e9
35+
upstream-source: ghcr.io/canonical/charmed-mysql@sha256:e78bdba30923ec87d67879a284d9162dfbb7600b34cbf3f84c9b4cce08648715
3636

3737
peers:
3838
database-peers:

src/dependency.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"dependencies": {},
1010
"name": "charmed-mysql",
1111
"upgrade_supported": ">8.0.31",
12-
"version": "8.0.41"
12+
"version": "8.0.42"
1313
}
1414
}

0 commit comments

Comments
 (0)