diff --git a/api/config_sample.txt b/api/config_sample.txt index 65020a242a25954941fee9b9a9d0e0930fa7ba21..468556b5f6da0d74a6efec2bb17add51f93ebd1a 100644 --- a/api/config_sample.txt +++ b/api/config_sample.txt @@ -91,8 +91,8 @@ $CFG->inputmustverify = 1; $CFG->inputshowvalidation = 1; // These should match the version of goemaxima in docker-compose. -$CFG->stackmaximaversion = "2025072400"; -$CFG->version = "2025072400"; +$CFG->stackmaximaversion = "2024072400"; +$CFG->version = "2024072400"; // Do not change this setting. $CFG->mathsdisplay = 'api'; diff --git a/api/docker/docker-compose.dev.yml b/api/docker/docker-compose.dev.yml index 548f6fc22156215be30ecbf762c6786bf593e7be..32fb97121f2cbd811edd7ac099e755093aa3c17f 100644 --- a/api/docker/docker-compose.dev.yml +++ b/api/docker/docker-compose.dev.yml @@ -1,7 +1,7 @@ version: "4.0" services: maxima: - image: mathinstitut/goemaxima:2025072400-latest + image: mathinstitut/goemaxima:2024072400-latest tmpfs: - "/tmp" restart: unless-stopped diff --git a/api/docker/docker-compose.yml b/api/docker/docker-compose.yml index 054c3dee214133e3b8b3551ef2bd9d066d669182..00eaa3030f122370e652f53ba4d3e261ef099977 100644 --- a/api/docker/docker-compose.yml +++ b/api/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: "4.0" services: maxima: - image: mathinstitut/goemaxima:2025072400-latest + image: mathinstitut/goemaxima:2024072400-latest tmpfs: - "/tmp" restart: unless-stopped diff --git a/doc/en/Developer/Releasing.md b/doc/en/Developer/Releasing.md index 454a986b66792407794cc68f0fd1bd0cad123331..f6112b08d32cff6fba01621728e637ed2bf53248 100644 --- a/doc/en/Developer/Releasing.md +++ b/doc/en/Developer/Releasing.md @@ -42,16 +42,16 @@ Unless you want to discuss something confidential with the developers, please do * Spin up the STACK API in Docker and check it still works with a selection of questions, including download and JSXGraph. * Chances are it won't work because even the latest version of goemaxima is out of date. * You will need to create a local up-to-date image of goemaxima: - * Clone the goemaxima repo and create a folder stack/STACKVERSION e.g. `stack/2025072400` matching the latest STACK version. + * Clone the goemaxima repo and create a folder stack/STACKVERSION e.g. `stack/2024072400` matching the latest STACK version. * Copy the stack/maxima folder from STACK into this new folder. * Create `maximalocal.mac.template` as described in `Adding_new_version.md` in goemaxima docs (or just copy from previous goemaxima version). * In `buildimage.sh` set `maximaver` and `sbclver` e.g. `maximaver="5.45.1" sbclver="2.2.6"`. (`maximaver` should match `maximalocal.mac.template`) * `./buildweb.sh` (You may need to install `go` first: `sudo snap install go --classic`). - * `.buildimage.s 2025072400` (If Docker struggles to fetch metadata `sudo vi ~/.docker/config.json` and change `credsStore` to `credStore`). - * You should have now created a `goemaxima:2025072400-dev` image locally. + * `.buildimage.s 2024072400` (If Docker struggles to fetch metadata `sudo vi ~/.docker/config.json` and change `credsStore` to `credStore`). + * You should have now created a `goemaxima:2024072400-dev` image locally. * Temporarily update STACK API locally: - * Update maxima image in STACK API to `goemaxima:2025072400-dev` in `docker-compose.dev.yml`. - * Update `stackmaximaversion` and `version` in `config.php` for the API to e.g. 2025072400. + * Update maxima image in STACK API to `goemaxima:2024072400-dev` in `docker-compose.dev.yml`. + * Update `stackmaximaversion` and `version` in `config.php` for the API to e.g. 2024072400. * `docker compose -f docker-compose.dev.yml up` ### Version numbers diff --git a/doc/en/Installation/STACK_versions.md b/doc/en/Installation/STACK_versions.md index 91073a89fa256f992d48ce298ab68b903a599980..45619bbae7035901021f0bcf604e9813f3942ba8 100644 --- a/doc/en/Installation/STACK_versions.md +++ b/doc/en/Installation/STACK_versions.md @@ -9,7 +9,7 @@ when releasing. Release | Version number | Supported Maxima versions --------|----------------|-------------------------- -4.7.0 | 2025072400 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0 +4.7.0 | 2024072400 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0 4.6.0 | 2024060300 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0 4.5.0 | 2023121100 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0 4.4.5 | 2023072101 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0 diff --git a/stack/maxima/stackmaxima.mac b/stack/maxima/stackmaxima.mac index 7d5d8e56f6a66f4356a163bd9dccd80c331d26d6..37a145eef906f7caf6c3e10152540c79fccc3487 100644 --- a/stack/maxima/stackmaxima.mac +++ b/stack/maxima/stackmaxima.mac @@ -3331,4 +3331,4 @@ is_lang(code):=ev(is(%_STACK_LANG=code),simp=true)$ /* Stack expects some output with the version number the output happens at */ /* maximalocal.mac after additional library loading */ -stackmaximaversion:2025072400$ +stackmaximaversion:2024072400$ diff --git a/version.php b/version.php index 3ad00ac5550a095aa1047deb82104b70975db144..c81a90d21d97fdff014cb9268076563db24d216a 100644 --- a/version.php +++ b/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2025072400; +$plugin->version = 2024072400; $plugin->requires = 2022041900; $plugin->cron = 0; $plugin->component = 'qtype_stack';