Skip to content

Commit c94991e

Browse files
Revert (for testing) "Set charm refresh compatibility version from git tag"
This reverts commit fb9d59a.
1 parent d0dda6a commit c94991e

File tree

5 files changed

+6
-72
lines changed

5 files changed

+6
-72
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,8 @@ 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: 'dpe'
21-
permissions:
22-
contents: write # Needed to create git tag
23-
2416
ci-tests:
2517
name: Tests
26-
needs:
27-
- tag
2818
uses: ./.github/workflows/ci.yaml
2919
secrets: inherit
3020
permissions:
@@ -33,11 +23,10 @@ jobs:
3323
release:
3424
name: Release charm
3525
needs:
36-
- tag
3726
- ci-tests
3827
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
3928
with:
40-
track: ${{ needs.tag.outputs.track }}
29+
track: 'dpe'
4130
artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}
4231
secrets:
4332
charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}

charmcraft.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,10 @@ parts:
8383
files:
8484
plugin: dump
8585
source: .
86-
after:
87-
- poetry-deps # Ensure poetry is installed
8886
build-packages:
8987
- git
9088
override-build: |
91-
# Set `charm_version` in refresh_versions.toml from git tag
92-
# Create venv in `..` so that git working tree is not dirty
93-
python3 -m venv ../refresh-version-venv
94-
source ../refresh-version-venv/bin/activate
95-
poetry install --only build-refresh-version
96-
write-charm-version
97-
89+
# TODO: set charm version in refresh_versions.toml
9890
craftctl default
9991
stage:
10092
- 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
@@ -56,12 +56,6 @@ tenacity = "^9.0.0"
5656
ops = "^2.9.0"
5757
allure-pytest-default-results = "^0.1.2"
5858

59-
[tool.poetry.group.build-refresh-version]
60-
optional = true
61-
62-
[tool.poetry.group.build-refresh-version.dependencies]
63-
charm-refresh-build-version = "^0.2.0"
64-
6559
[tool.coverage.run]
6660
branch = true
6761

refresh_versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
charm_major = 1
22
workload = "8.0.41"
33

4+
charm = "8.0/1.0.0" # TODO remove
5+
46
[snap]
57
name = "charmed-mysql"
68

0 commit comments

Comments
 (0)