Skip to content

Commit 6aab7a1

Browse files
Temp manually set charm version for testing (revert before merge)
1 parent 9659740 commit 6aab7a1

File tree

5 files changed

+6
-70
lines changed

5 files changed

+6
-70
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,18 @@ on:
1313
- '.github/workflows/sync_docs.yaml'
1414

1515
jobs:
16-
tag:
17-
name: Create charm refresh compatibility version git tag
18-
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
19-
with:
20-
track: '8.0'
21-
permissions:
22-
contents: write # Needed to create git tag
23-
2416
ci-tests:
25-
needs:
26-
- tag
2717
uses: ./.github/workflows/ci.yaml
2818
permissions:
2919
contents: write # Needed for Allure Report
3020

3121
release:
3222
name: Release charm
3323
needs:
34-
- tag
3524
- ci-tests
3625
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
3726
with:
38-
track: ${{ needs.tag.outputs.track }}
27+
track: '8.0'
3928
artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}
4029
secrets:
4130
charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}

charmcraft.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,7 @@ parts:
8989
build-packages:
9090
- git
9191
override-build: |
92-
# Set `charm_version` in refresh_versions.toml from git tag
93-
# Create venv in `..` so that git working tree is not dirty
94-
python3 -m venv ../refresh-version-venv
95-
source ../refresh-version-venv/bin/activate
96-
poetry install --only build-refresh-version
97-
write-charm-version
98-
92+
# TODO: set charm version in refresh_versions.toml
9993
craftctl default
10094
stage:
10195
- LICENSE

poetry.lock

Lines changed: 2 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ tenacity = "^9.1.2"
6060
allure-pytest = "^2.14.3"
6161
allure-pytest-default-results = "^0.1.3"
6262

63-
[tool.poetry.group.build-refresh-version]
64-
optional = true
65-
66-
[tool.poetry.group.build-refresh-version.dependencies]
67-
charm-refresh-build-version = "^0.4.0"
68-
6963
[tool.coverage.run]
7064
branch = true
7165

refresh_versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
charm_major = 1
44
workload = "8.0.42"
5+
6+
charm = "8.0/1.0.0" # TODO remove

0 commit comments

Comments
 (0)