Skip to content

Commit bcbbc0a

Browse files
authored
Run Allure workflow only on schedule (#69)
* Run Allure workflow only on schedule * Run Allure workflow only on schedule * Refactor signingKeyPath assignment for clarity * Modify charm build configuration in charmcraft.yaml Updated build configuration for the charm to use rustup. * Remove cargo from build-packages Removed 'cargo' from the build-packages list. * Update juju-channel to 3.6/stable
1 parent 0644136 commit bcbbc0a

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

.github/workflows/integration_test.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ name: Integration tests
22

33
on:
44
pull_request:
5+
schedule:
6+
- cron: "0 15 * * SAT"
57

68
jobs:
79
integration-tests:
8-
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
10+
uses:
11+
canonical/operator-workflows/.github/workflows/integration_test.yaml@main
912
secrets: inherit
1013
with:
11-
juju-channel: 3.4/stable
14+
juju-channel: 3.6/stable
1215
provider: lxd
1316
modules: '["test_charm.py", "test_ingress.py"]'
1417
allure-report:
15-
if: always() && !cancelled()
18+
if: ${{ !cancelled() && github.event_name == 'schedule' }}
1619
needs:
17-
- integration-tests
20+
- integration-tests
1821
uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main

charmcraft.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ bases:
1010
channel: "22.04"
1111
parts:
1212
charm:
13-
build-packages: [cargo, rustc, pkg-config, libffi-dev, libssl-dev]
13+
build-snaps:
14+
- rustup
15+
override-build: |
16+
rustup default stable
17+
craftctl default
18+
build-packages:
19+
- libffi-dev
20+
- libssl-dev
21+
- pkg-config
1422
charm-binary-python-packages:
1523
- cryptography
1624

src/irc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ def _eval_conf_local(
295295
if self.matrix:
296296
data["homeserver"]["url"] = self.matrix.homeserver
297297
data["homeserver"]["domain"] = get_matrix_domain(self.matrix.homeserver)
298-
data["ircService"]["mediaProxy"]["signingKeyPath"] = (
299-
f"{IRC_BRIDGE_SIGNING_KEY_FILE_PATH}"
300-
)
298+
data["ircService"]["mediaProxy"][
299+
"signingKeyPath"
300+
] = f"{IRC_BRIDGE_SIGNING_KEY_FILE_PATH}"
301301
data["ircService"]["mediaProxy"]["publicUrl"] = self.media_external_url
302302
data["ircService"]["passwordEncryptionKeyPath"] = f"{IRC_BRIDGE_PEM_FILE_PATH}"
303303
if self.config:

0 commit comments

Comments
 (0)