File tree Expand file tree Collapse file tree 2 files changed +6
-22
lines changed
tests/integration/application-charm Expand file tree Collapse file tree 2 files changed +6
-22
lines changed Original file line number Diff line number Diff line change @@ -50,25 +50,10 @@ parts:
5050 - libssl-dev # Needed to build Python dependencies with Rust from source
5151 - pkg-config # Needed to build Python dependencies with Rust from source
5252 - libev-dev
53+ - rustup
5354 override-build : |
54- # Workaround for https://github.com/canonical/charmcraft/issues/2068
55- # rustup used to install rustc and cargo, which are needed to build Python dependencies with Rust from source
56- if [[ "$CRAFT_PLATFORM" == ubuntu@20.04:* || "$CRAFT_PLATFORM" == ubuntu@22.04:* ]]
57- then
58- snap install rustup --classic
59- else
60- apt-get install rustup -y
61- fi
62-
63- # If Ubuntu version < 24.04, rustup was installed from snap instead of from the Ubuntu
64- # archive—which means the rustup version could be updated at any time. Print rustup version
65- # to build log to make changes to the snap's rustup version easier to track
66- rustup --version
67-
68- # rpds-py (Python package) >=0.19.0 requires rustc >=1.76, which is not available in the
69- # Ubuntu 22.04 archive. Install rustc and cargo using rustup instead of the Ubuntu archive
7055 rustup set profile minimal
71- rustup default 1.87.0 # renovate: charmcraft-rust-latest
56+ rustup default 1.93.1
7257
7358 craftctl default
7459 # Include requirements.txt in *.charm artifact for easier debugging
9277 craftctl default
9378 stage :
9479 - LICENSE
95- - refresh_versions.toml
80+ - refresh_versions.toml
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ charm-libs:
1010 version : " 2"
1111 - lib : data_platform_libs.data_interfaces
1212 version : " 1"
13-
1413
1514# Files implicitly created by charmcraft without a part:
1615# - dispatch (https://github.com/canonical/charmcraft/pull/1898)
5756 after :
5857 - poetry-deps
5958 poetry-export-extra-args : ['--only', 'main,charm-libs']
60- poetry-pip-extra-args : ["--only-binary=cassandra-driver"]
59+ poetry-pip-extra-args : ["--only-binary=cassandra-driver"]
6160 build-packages :
6261 - libffi-dev # Needed to build Python dependencies with Rust from source
6362 - libssl-dev # Needed to build Python dependencies with Rust from source
7473 # rpds-py (Python package) >=0.19.0 requires rustc >=1.76, which is not available in the
7574 # Ubuntu 22.04 archive. Install rustc and cargo using rustup instead of the Ubuntu archive
7675 rustup set profile minimal
77- rustup default 1.83.0 # renovate: charmcraft-rust-latest
76+ rustup default 1.93.1 # renovate: charmcraft-rust-latest
7877
7978
8079 craftctl default
8180 # Include requirements.txt in *.charm artifact for easier debugging
82- cp requirements.txt "$CRAFT_PART_INSTALL/requirements.txt"
81+ cp requirements.txt "$CRAFT_PART_INSTALL/requirements.txt"
You can’t perform that action at this time.
0 commit comments