diff --git a/Makefile b/Makefile index 8d1fc7ea..d09123a3 100644 --- a/Makefile +++ b/Makefile @@ -293,7 +293,7 @@ deploy-pages: mv docs/build/html www touch www/.nojekyll rm www/.buildinfo || true - git checkout --track $(DOCS_REMOTE)/gh-pages + git checkout --track $(DOCS_REMOTE)/gh-pages || git checkout $(DOCS_REMOTE)/gh-pages rm -r docs || true mv www docs git add -f docs diff --git a/auxiliary_packages/funman_demo/src/funman_demo/_version.py b/auxiliary_packages/funman_demo/src/funman_demo/_version.py index 178b5f06..1d905486 100644 --- a/auxiliary_packages/funman_demo/src/funman_demo/_version.py +++ b/auxiliary_packages/funman_demo/src/funman_demo/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.6.0" +__version__ = "1.7.0" diff --git a/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py b/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py index 178b5f06..1d905486 100644 --- a/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py +++ b/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.6.0" +__version__ = "1.7.0" diff --git a/src/funman/_version.py b/src/funman/_version.py index 178b5f06..1d905486 100644 --- a/src/funman/_version.py +++ b/src/funman/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.6.0" +__version__ = "1.7.0" diff --git a/terarium/scripts/run-api-in-docker.sh b/terarium/scripts/run-api-in-docker.sh index 03b00ea4..1d2fcc91 100755 --- a/terarium/scripts/run-api-in-docker.sh +++ b/terarium/scripts/run-api-in-docker.sh @@ -4,7 +4,7 @@ # TARGET_IMAGE=localhost:5000/siftech/funman-api:local # For public images: -FUNMAN_VERSION="${FUNMAN_VERSION:-hackathon_fall_2023}" +FUNMAN_VERSION="${FUNMAN_VERSION:-1.7.0}" TARGET_IMAGE="${TARGET_IMAGE:-ghcr.io/siftech/funman-api:$FUNMAN_VERSION}" PLATFORM="${PLATFORM:---platform linux/amd64}"