markup2website

A tool to turn a markup file into a website.

Home

Source code

git clone https://projects.rickardlindberg.me/scm/markup2website.git

Website

https://projects.rickardlindberg.me/markup2website

Recent events

2026-01-10 15:33 Rickard pushed to markup2website

commit 6098f52345b8e045a0aa8d501fe561e3803c625b
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 15:32:51 2026 +0100

    Remove obsolete instructions

diff --git a/README.md b/README.md
index 0a44952..9cb0529 100644
--- a/README.md
+++ b/README.md
@@ -25,12 +25,6 @@ markup2website <README.md >website/index.html
 * First version (used by
   [rlworkbench](https://projects.rickardlindberg.me/rlworkbench/) and itself)
 
-## How to make a release
-
-* Finalize chanagelog
-* `git commit -a -m 'Release <version>' && git push && git tag <version>`
-* Bump version in `release.sh` and add entry in changelog
-
 ## TODO
 
 * Include newsletter jumbotron

2026-01-10 15:23 Rickard pushed to markup2website

commit 9e15009860c525ecf0e1b07745034363e6326ad5
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 15:23:24 2026 +0100

    Clean up

diff --git a/make.sh b/make.sh
index 15fa64f..6b3aeec 100755
--- a/make.sh
+++ b/make.sh
@@ -4,19 +4,19 @@ set -e -x
 
 RLWORKBENCH_VERSION=1.1.0
 RLWORKBENCH_FOLDER_NAME=rlworkbench-$RLWORKBENCH_VERSION
-RLWORKBENCH_ARCHIVE_NAME=$RLWORKBENCH_FOLDER_NAME.tgz
+RLWORKBENCH_ARCHIVE=https://projects.rickardlindberg.me/artifacts/rlworkbench/$RLWORKBENCH_VERSION/$RLWORKBENCH_FOLDER_NAME.tgz
 
 CHANGELOG2VERSION_VERSION=1.1.0
 CHANGELOG2VERSION_FOLDER_NAME=changelog2version-$CHANGELOG2VERSION_VERSION
-CHANGELOG2VERSION_ARCHIVE_NAME=$CHANGELOG2VERSION_FOLDER_NAME.tgz
+CHANGELOG2VERSION_ARCHIVE=https://projects.rickardlindberg.me/artifacts/changelog2version/$CHANGELOG2VERSION_VERSION/$CHANGELOG2VERSION_FOLDER_NAME.tgz
 
 rm -rf out
 mkdir out
 cd out
 
-curl https://projects.rickardlindberg.me/artifacts/rlworkbench/$RLWORKBENCH_VERSION/$RLWORKBENCH_ARCHIVE_NAME | tar xzvv
+curl $RLWORKBENCH_ARCHIVE | tar xzvv
 
-curl https://projects.rickardlindberg.me/artifacts/changelog2version/$CHANGELOG2VERSION_VERSION/$CHANGELOG2VERSION_ARCHIVE_NAME | tar xzvv
+curl $CHANGELOG2VERSION_ARCHIVE | tar xzvv
 
 mv $RLWORKBENCH_FOLDER_NAME/rlworkbench_cli .
 
diff --git a/website.sh b/website.sh
index b6eb66b..2eaf079 100755
--- a/website.sh
+++ b/website.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env sh
 
-set -e
-
-set -x
+set -e -x
 
 MARKUP2WEBSITE_VERSION=1.0.0
 MARKUP2WEBSITE_FOLDER_NAME=markup2website-$MARKUP2WEBSITE_VERSION

2026-01-10 14:34 Rickard pushed to markup2website

commit 1c44a03047b1fbdfbc0a3f59a4a2c019d7e0a67d
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 14:34:47 2026 +0100

    Use PROJECTS2_TAGS

diff --git a/make.sh b/make.sh
index cf9ab84..15fa64f 100755
--- a/make.sh
+++ b/make.sh
@@ -6,7 +6,7 @@ RLWORKBENCH_VERSION=1.1.0
 RLWORKBENCH_FOLDER_NAME=rlworkbench-$RLWORKBENCH_VERSION
 RLWORKBENCH_ARCHIVE_NAME=$RLWORKBENCH_FOLDER_NAME.tgz
 
-CHANGELOG2VERSION_VERSION=1.0.0
+CHANGELOG2VERSION_VERSION=1.1.0
 CHANGELOG2VERSION_FOLDER_NAME=changelog2version-$CHANGELOG2VERSION_VERSION
 CHANGELOG2VERSION_ARCHIVE_NAME=$CHANGELOG2VERSION_FOLDER_NAME.tgz
 
diff --git a/release.sh b/release.sh
index b08948f..9a4ce5b 100755
--- a/release.sh
+++ b/release.sh
@@ -16,4 +16,4 @@ cp out/markup2website $TARGET
 
 (cd out && tar czvvf $ARCHIVE_NAME $FOLDER_NAME)
 
-echo "{\"artifacts\": [{\"source\": \"out/$ARCHIVE_NAME\", \"destination\": \"$VERSION/$ARCHIVE_NAME\"}]}" > Dockerfile.release.ci.files
+echo "{\"artifacts\": [{\"source\": \"out/$ARCHIVE_NAME\", \"destination\": \"$VERSION/$ARCHIVE_NAME\"}]$PROJECTS2_TAGS}" > Dockerfile.release.ci.files

2026-01-10 13:55 Rickard pushed to markup2website

commit f0b1fdb5d9029c007016452c3e5bab777145f18a
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 13:55:23 2026 +0100

    Build with changelog2version

diff --git a/make.sh b/make.sh
index eba4043..cf9ab84 100755
--- a/make.sh
+++ b/make.sh
@@ -1,26 +1,28 @@
 #!/usr/bin/env bash
 
-set -e
+set -e -x
 
 RLWORKBENCH_VERSION=1.1.0
 RLWORKBENCH_FOLDER_NAME=rlworkbench-$RLWORKBENCH_VERSION
 RLWORKBENCH_ARCHIVE_NAME=$RLWORKBENCH_FOLDER_NAME.tgz
 
+CHANGELOG2VERSION_VERSION=1.0.0
+CHANGELOG2VERSION_FOLDER_NAME=changelog2version-$CHANGELOG2VERSION_VERSION
+CHANGELOG2VERSION_ARCHIVE_NAME=$CHANGELOG2VERSION_FOLDER_NAME.tgz
+
 rm -rf out
 mkdir out
 cd out
 
-curl https://projects.rickardlindberg.me/artifacts/rlworkbench/$RLWORKBENCH_VERSION/$RLWORKBENCH_ARCHIVE_NAME -o $RLWORKBENCH_ARCHIVE_NAME
+curl https://projects.rickardlindberg.me/artifacts/rlworkbench/$RLWORKBENCH_VERSION/$RLWORKBENCH_ARCHIVE_NAME | tar xzvv
 
-tar xzvvf $RLWORKBENCH_ARCHIVE_NAME
+curl https://projects.rickardlindberg.me/artifacts/changelog2version/$CHANGELOG2VERSION_VERSION/$CHANGELOG2VERSION_ARCHIVE_NAME | tar xzvv
 
 mv $RLWORKBENCH_FOLDER_NAME/rlworkbench_cli .
 
-PATH=".:$PATH"
+PATH=".:$CHANGELOG2VERSION_FOLDER_NAME:$PATH"
 
-rlworkbench_cli run ../version.meta >version.c
-gcc -O2 version.c -o version
-version <../README.md >versions.sh
+changelog2version <../README.md >version.sh
 
 rlworkbench_cli run ../template.meta >template.c
 
diff --git a/release.sh b/release.sh
index 2061504..b08948f 100755
--- a/release.sh
+++ b/release.sh
@@ -4,7 +4,7 @@ set -e -x
 
 ./make.sh
 
-source out/versions.sh
+source out/version.sh
 
 FOLDER_NAME=markup2website-$FULL_VERSION
 TARGET=out/$FOLDER_NAME
diff --git a/version.meta b/version.meta
deleted file mode 100644
index 8c79a3b..0000000
--- a/version.meta
+++ /dev/null
@@ -1,27 +0,0 @@
-main = findChangelog:x -> { x };
-
-findChangelog = skipLine* changelog:x -> { x };
-    skipLine = !changelog restLine;
-
-changelog = '## Changelog\n\n' versionLine:x -> { x };
-
-versionLine =
-    | '### ' versionNumber:x '\n' -> {
-        "VERSION=" x "\n"
-        "FULL_VERSION=" x "-beta.$YMD+$VCS_SHORT_ID\n"
-    }
-    | '### ' versionNumber:x ' (' date ')\n' -> {
-        "VERSION=" x "\n"
-        "FULL_VERSION=" x "\n"
-    }
-    ;
-
-versionNumber = number '.' number '.' number;
-
-date = number '-' number '-' number;
-
-restLine = notNewline* '\n';
-    notNewline = !'\n' .;
-
-number = digit digit*;
-    digit = '0'-'9';

2026-01-10 13:05 Rickard pushed to markup2website

commit 0c85d368414ee0bafae24662ddf045ec879d8b62
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 13:05:16 2026 +0100

    Add beta

diff --git a/version.meta b/version.meta
index 829320e..8c79a3b 100644
--- a/version.meta
+++ b/version.meta
@@ -8,7 +8,7 @@ changelog = '## Changelog\n\n' versionLine:x -> { x };
 versionLine =
     | '### ' versionNumber:x '\n' -> {
         "VERSION=" x "\n"
-        "FULL_VERSION=" x "-$YMD+$VCS_SHORT_ID\n"
+        "FULL_VERSION=" x "-beta.$YMD+$VCS_SHORT_ID\n"
     }
     | '### ' versionNumber:x ' (' date ')\n' -> {
         "VERSION=" x "\n"

commit e6b89818ee650ee602e18bedba03b3cf089bf7c2
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 13:04:48 2026 +0100

    Fix short id name

diff --git a/version.meta b/version.meta
index 131c453..829320e 100644
--- a/version.meta
+++ b/version.meta
@@ -8,7 +8,7 @@ changelog = '## Changelog\n\n' versionLine:x -> { x };
 versionLine =
     | '### ' versionNumber:x '\n' -> {
         "VERSION=" x "\n"
-        "FULL_VERSION=" x "-$YMD+$VCS_SHORT\n"
+        "FULL_VERSION=" x "-$YMD+$VCS_SHORT_ID\n"
     }
     | '### ' versionNumber:x ' (' date ')\n' -> {
         "VERSION=" x "\n"

2026-01-10 13:04 Rickard pushed to markup2website

commit 4dd7788a1a2afabbf737e8a58570cc6dd48ce9da
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Sat Jan 10 13:04:07 2026 +0100

    Experiment with new release version scheme

diff --git a/make.sh b/make.sh
index 9d54c16..eba4043 100755
--- a/make.sh
+++ b/make.sh
@@ -18,6 +18,10 @@ mv $RLWORKBENCH_FOLDER_NAME/rlworkbench_cli .
 
 PATH=".:$PATH"
 
+rlworkbench_cli run ../version.meta >version.c
+gcc -O2 version.c -o version
+version <../README.md >versions.sh
+
 rlworkbench_cli run ../template.meta >template.c
 
 gcc -O2 template.c -o template
diff --git a/release.sh b/release.sh
index 9821be1..2061504 100755
--- a/release.sh
+++ b/release.sh
@@ -1,14 +1,12 @@
 #!/usr/bin/env sh
 
-set -e
+set -e -x
 
 ./make.sh
 
-VERSION=1.2.0
-FOLDER_NAME=markup2website-$VERSION
-if ! echo $GIT_MESSAGE | grep "\b[rR]elease ${VERSION}\b"; then
-    FOLDER_NAME="$FOLDER_NAME-$GIT_HASH"
-fi
+source out/versions.sh
+
+FOLDER_NAME=markup2website-$FULL_VERSION
 TARGET=out/$FOLDER_NAME
 ARCHIVE_NAME=$FOLDER_NAME.tgz
 
diff --git a/version.meta b/version.meta
new file mode 100644
index 0000000..131c453
--- /dev/null
+++ b/version.meta
@@ -0,0 +1,27 @@
+main = findChangelog:x -> { x };
+
+findChangelog = skipLine* changelog:x -> { x };
+    skipLine = !changelog restLine;
+
+changelog = '## Changelog\n\n' versionLine:x -> { x };
+
+versionLine =
+    | '### ' versionNumber:x '\n' -> {
+        "VERSION=" x "\n"
+        "FULL_VERSION=" x "-$YMD+$VCS_SHORT\n"
+    }
+    | '### ' versionNumber:x ' (' date ')\n' -> {
+        "VERSION=" x "\n"
+        "FULL_VERSION=" x "\n"
+    }
+    ;
+
+versionNumber = number '.' number '.' number;
+
+date = number '-' number '-' number;
+
+restLine = notNewline* '\n';
+    notNewline = !'\n' .;
+
+number = digit digit*;
+    digit = '0'-'9';

2026-01-09 20:21 Rickard pushed to markup2website

commit b48cd18031a727dcf6027bb95b93dbfeef39d7ab
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Fri Jan 9 20:20:44 2026 +0100

    Better changelog description

diff --git a/README.md b/README.md
index b1c7e85..0a44952 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@ markup2website <README.md >website/index.html
 
 ### 1.1.0 (2026-01-09)
 
-* Bump version of rlworkbench to 1.1.0
+* Upgrade [rlworkbench](https://projects.rickardlindberg.me/rlworkbench/) from
+  1.0.0 to 1.1.0
 
 ### 1.0.0 (2026-01-04)
 

2026-01-09 20:14 Rickard pushed to markup2website

commit 0b8b27edfe82e8c85f428b1adf7bee538db5a822
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Fri Jan 9 20:13:52 2026 +0100

    Prepare for next release

diff --git a/README.md b/README.md
index fdc6f67..b1c7e85 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,10 @@ markup2website <README.md >website/index.html
 
 ## Changelog
 
+### 1.2.0
+
+* ...
+
 ### 1.1.0 (2026-01-09)
 
 * Bump version of rlworkbench to 1.1.0
diff --git a/release.sh b/release.sh
index ea676a6..9821be1 100755
--- a/release.sh
+++ b/release.sh
@@ -4,7 +4,7 @@ set -e
 
 ./make.sh
 
-VERSION=1.1.0
+VERSION=1.2.0
 FOLDER_NAME=markup2website-$VERSION
 if ! echo $GIT_MESSAGE | grep "\b[rR]elease ${VERSION}\b"; then
     FOLDER_NAME="$FOLDER_NAME-$GIT_HASH"

2026-01-09 20:12 Rickard pushed to markup2website

commit 69386f03366e1f55b6102d57501e6917416f7300
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Fri Jan 9 20:12:39 2026 +0100

    Release 1.1.0

diff --git a/README.md b/README.md
index 7cfefe9..fdc6f67 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ markup2website <README.md >website/index.html
 
 ## Changelog
 
-### 1.1.0
+### 1.1.0 (2026-01-09)
 
 * Bump version of rlworkbench to 1.1.0
 

commit b389813a4fe007d8cf9a0a2e7e8767b373408e5b
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Fri Jan 9 20:11:50 2026 +0100

    Bump rlworkbench to 1.1.0

diff --git a/README.md b/README.md
index fb01b4a..7cfefe9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ markup2website <README.md >website/index.html
 
 ### 1.1.0
 
-* ...
+* Bump version of rlworkbench to 1.1.0
 
 ### 1.0.0 (2026-01-04)
 
diff --git a/make.sh b/make.sh
index 345d3a2..9d54c16 100755
--- a/make.sh
+++ b/make.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-RLWORKBENCH_VERSION=1.0.0
+RLWORKBENCH_VERSION=1.1.0
 RLWORKBENCH_FOLDER_NAME=rlworkbench-$RLWORKBENCH_VERSION
 RLWORKBENCH_ARCHIVE_NAME=$RLWORKBENCH_FOLDER_NAME.tgz
 

2026-01-06 20:41 Rickard pushed to markup2website

commit 1afaeb3b6468f39f784d352ce7009f7aa9021f44
Author: Rickard Lindberg <rickard@rickardlindberg.me>
Date:   Tue Jan 6 20:41:21 2026 +0100

    Dummy