Skip to content

Commit

Permalink
Merge branch 'dpe-2904-self-hosted' into dpe-3039-snap-bump-self-hosted
Browse files Browse the repository at this point in the history
  • Loading branch information
dragomirp committed Nov 24, 2023
2 parents 91275eb + c9c9541 commit f1ffe6d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
lint:
name: Lint
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v6.2.0
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v6.3.0

unit-test:
name: Unit test charm
Expand All @@ -42,7 +42,7 @@ jobs:

build:
name: Build charm
uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v6.2.0
uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v6.3.0
permissions:
actions: write # Needed to manage GitHub Actions cache

Expand All @@ -52,7 +52,7 @@ jobs:
- build
- lint
- unit-test
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@test-large
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v6.3.0
with:
artifact-name: ${{ needs.build.outputs.artifact-name }}
cloud: lxd
Expand All @@ -73,7 +73,7 @@ jobs:
- build
- lint
- unit-test
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@test-large
uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v6.3.0
with:
artifact-name: ${{ needs.build.outputs.artifact-name }}
cloud: lxd
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:

build:
name: Build charm
uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v6.2.0
uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v6.3.0

release:
name: Release charm
needs:
- ci-tests
- build
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v6.2.0
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v6.3.0
with:
channel: 14/edge
artifact-name: ${{ needs.build.outputs.artifact-name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync_issue_to_jira.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
sync:
name: Sync GitHub issue to Jira
uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v6.2.0
uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v6.3.0
with:
jira-base-url: https://warthogs.atlassian.net
jira-project-key: DPE
Expand Down
14 changes: 7 additions & 7 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ optional = true

[tool.poetry.group.integration.dependencies]
pytest = "^7.4.0"
pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.2.0", subdirectory = "python/pytest_plugins/github_secrets"}
pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.3.0", subdirectory = "python/pytest_plugins/github_secrets"}
pytest-operator = "^0.29.0"
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.2.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.2.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.3.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.3.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
juju = "^3.2.2"
boto3 = "^1.28.70"
tenacity = "^8.2.3"
Expand Down

0 comments on commit f1ffe6d

Please sign in to comment.