diff --git a/Makefile b/Makefile index 13a72896..551174f6 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ $(foreach img,$(image_stacks),$(eval $(call stack,$(img)))) freeze-file: $(STACK)/$(stack_freeze_file) %/$(stack_freeze_file): STACK = $* %/$(stack_freeze_file): - ./build.sh build -v \ + ./build.sh build -v -f \ -r "$(STACK)-builder-base" \ -s "$(STACK)" \ -c "$(PANDOC_COMMIT)" \ diff --git a/build.sh b/build.sh index 367ce492..f8f8de37 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,7 @@ fi # shellcheck disable=SC2086 set -- $args +create_freeze= directory=. pandoc_commit=main repo=core @@ -40,6 +41,10 @@ while true; do directory="${2}" shift 2 ;; + (-f) + create_freeze='true' + shift 1 + ;; (-r) repo="${2}" shift 2 @@ -96,6 +101,12 @@ if [ -z "$pandoc_version_opts" ]; then exit 1 fi +freeze_file="${directory}/${stack}/freeze/pandoc-$pandoc_commit.project.freeze" +if [ "$pandoc_commit" != "main" ] && [ ! -f "$freeze_file" ] && [ -z "$create_freeze" ]; then + printf 'Freeze file not found: %s\n' "$freeze_file" >&2 + exit 1 +fi + version_table_field () { printf '%s\n' "$pandoc_version_opts" | \ diff --git a/versions.md b/versions.md index cbae4516..c2ad6242 100644 --- a/versions.md +++ b/versions.md @@ -1,8 +1,9 @@ -| pandoc | tags | Alpine | Ubuntu | TeXLive | Lua | -|----------+-------------------------------+--------+--------+---------+-----| -| main | edge | 3.19.1 | jammy | | 5.4 | -| 3.1.1 | 3.1.1.0 3.1.1 3.1 3 latest | 3.16.4 | jammy | 2022 | 5.4 | -| 3.0.1 | 3.0.1.0 3.0.1 3.0 | 3.16.4 | jammy | 2022 | 5.4 | -| 2.19.2 | 2.19.2.0 2.19.2 2.19 2 | 3.16.4 | jammy | 2022 | 5.3 | -| 2.18 | 2.18.0.0 2.18.0 2.18 | 3.14.8 | focal | 2021 | 5.3 | -| 2.17.1.1 | 2.17.1.1 2.17.1 2.17 | 3.14.8 | focal | 2021 | 5.3 | +| pandoc | tags | Alpine | Ubuntu | TeXLive | Lua | +|----------+----------------------------------+--------+--------+---------+-----| +| main | edge | 3.19.1 | jammy | | 5.4 | +| 3.1.12 | 3.1.12.0 3.1.12 3.12 3 latest | 3.19.1 | jammy | 2024 | 5.4 | +| 3.1.1 | 3.1.1.0 3.1.1 3.1 3 latest | 3.16.4 | jammy | 2022 | 5.4 | +| 3.0.1 | 3.0.1.0 3.0.1 3.0 | 3.16.4 | jammy | 2022 | 5.4 | +| 2.19.2 | 2.19.2.0 2.19.2 2.19 2 | 3.16.4 | jammy | 2022 | 5.3 | +| 2.18 | 2.18.0.0 2.18.0 2.18 | 3.14.8 | focal | 2021 | 5.3 | +| 2.17.1.1 | 2.17.1.1 2.17.1 2.17 | 3.14.8 | focal | 2021 | 5.3 |