From 57dbecc0acb8a6c600d71eb370eb3059827cf9a8 Mon Sep 17 00:00:00 2001 From: rzmk <30333942+rzmk@users.noreply.github.com> Date: Wed, 29 Apr 2026 10:45:08 +0000 Subject: [PATCH] feat: 0.3.3, update CKAN versions --- .github/workflows/run-ckan-only-install.yml | 2 +- docs/components/builder-sections/ckan-version.tsx | 12 ++++++------ docs/components/builder-sections/presets.tsx | 6 +++--- docs/components/builder.tsx | 2 +- docs/content/docs/changelog/0.3.3.mdx | 7 +++++++ install.bash | 4 ++-- src/main.rs | 2 +- src/questions.rs | 4 ++-- src/steps.rs | 2 +- 9 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 docs/content/docs/changelog/0.3.3.mdx diff --git a/.github/workflows/run-ckan-only-install.yml b/.github/workflows/run-ckan-only-install.yml index 68ea266..9b38f14 100644 --- a/.github/workflows/run-ckan-only-install.yml +++ b/.github/workflows/run-ckan-only-install.yml @@ -23,4 +23,4 @@ jobs: with: workspaces: ". -> target" - name: Run ckan-devstaller - run: cargo run --release --verbose -- --ckan-version 2.11.4 --skip-interactive --skip-run + run: cargo run --release --verbose -- --ckan-version 2.11.5 --skip-interactive --skip-run diff --git a/docs/components/builder-sections/ckan-version.tsx b/docs/components/builder-sections/ckan-version.tsx index d286068..7cec719 100644 --- a/docs/components/builder-sections/ckan-version.tsx +++ b/docs/components/builder-sections/ckan-version.tsx @@ -11,26 +11,26 @@ export default function CKANVersionBuilderSection({ config, setConfig }: any) { } - title="2.11.4" + title="2.11.5" className={ - config.ckanVersion === "2.11.4" + config.ckanVersion === "2.11.5" ? selectedCardClasses : "cursor-pointer" } onClick={() => { - setConfig({ ...config, ckanVersion: "2.11.4" }); + setConfig({ ...config, ckanVersion: "2.11.5" }); }} > } - title="2.10.9" + title="2.10.10" className={ - config.ckanVersion === "2.10.9" + config.ckanVersion === "2.10.10" ? selectedCardClasses : "cursor-pointer" } onClick={() => { - setConfig({ ...config, ckanVersion: "2.10.9" }); + setConfig({ ...config, ckanVersion: "2.10.10" }); }} > diff --git a/docs/components/builder-sections/presets.tsx b/docs/components/builder-sections/presets.tsx index 5b937b3..6436e24 100644 --- a/docs/components/builder-sections/presets.tsx +++ b/docs/components/builder-sections/presets.tsx @@ -18,8 +18,8 @@ export default function PresetsBuilderSection({ ({ preset: "ckan-only", - ckanVersion: "2.11.4", + ckanVersion: "2.11.5", extensions: [], features: [], }); diff --git a/docs/content/docs/changelog/0.3.3.mdx b/docs/content/docs/changelog/0.3.3.mdx new file mode 100644 index 0000000..30b6e34 --- /dev/null +++ b/docs/content/docs/changelog/0.3.3.mdx @@ -0,0 +1,7 @@ +--- +title: Changelog for ckan-devstaller v0.3.2 (2026-02-20) +--- + +## Update CKAN versions + +Updates default CKAN versions to 2.11.5 and 2.10.10. diff --git a/install.bash b/install.bash index 231ae85..4622401 100644 --- a/install.bash +++ b/install.bash @@ -22,9 +22,9 @@ skip_interactive=$2 if [ $preset == "dathere-default" ]; then if [ $skip_interactive == "skip-interactive" ]; then - ./ckan-devstaller --ckan-version 2.11.4 --extensions ckanext-scheming DataStore DataPusher+ --features enable-ssh --skip-interactive + ./ckan-devstaller --ckan-version 2.11.5 --extensions ckanext-scheming DataStore DataPusher+ --features enable-ssh --skip-interactive else - ./ckan-devstaller --ckan-version 2.11.4 --extensions ckanext-scheming DataStore DataPusher+ --features enable-ssh + ./ckan-devstaller --ckan-version 2.11.5 --extensions ckanext-scheming DataStore DataPusher+ --features enable-ssh fi else if [ $preset == "skip-interactive" ]; then diff --git a/src/main.rs b/src/main.rs index 7125be2..34f469a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -113,7 +113,7 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions ckan_version: if args.ckan_version.is_some() { args.ckan_version.unwrap() } else { - "2.11.4".to_string() + "2.11.5".to_string() }, sysadmin: default_sysadmin.clone(), extension_datastore: args diff --git a/src/questions.rs b/src/questions.rs index 402639e..d2c9f7a 100644 --- a/src/questions.rs +++ b/src/questions.rs @@ -16,7 +16,7 @@ pub fn question_ssh() -> Result { } pub fn question_ckan_version() -> Result { - let ckan_version_options: Vec<&str> = vec!["2.11.4", "2.10.9", "Other"]; + let ckan_version_options: Vec<&str> = vec!["2.11.5", "2.10.10", "Other"]; let answer_ckan_version = Select::new( "What CKAN version would you like to install? (optional)", ckan_version_options, @@ -26,7 +26,7 @@ pub fn question_ckan_version() -> Result { if answer_ckan_version == "Other" { Ok( Text::new("What CKAN version would you like to install? (optional)") - .with_default("2.11.4") + .with_default("2.11.5") .prompt()?, ) } else { diff --git a/src/steps.rs b/src/steps.rs index b0fcad9..ccd1f82 100644 --- a/src/steps.rs +++ b/src/steps.rs @@ -11,7 +11,7 @@ pub fn step_intro() { ); println!( "This installer should assist in setting up {} from a source installation along with ckan-compose. If you have any issues, please report them at https://support.dathere.com or https://github.com/dathere/ckan-devstaller/issues.", - highlighted_text("CKAN 2.11.4") + highlighted_text("CKAN 2.11.5") ); println!( "\nYou may also learn more about ckan-devstaller at https://ckan-devstaller.dathere.com."