diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2024-12-05 20:18:16 -0600 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2024-12-05 20:18:16 -0600 |
| commit | 83e8aab2897aa2982db48668e85757eef680ea5e (patch) | |
| tree | 835387be247a4c42094df1ddf1b9bf099a9c7f08 | |
| parent | Prepare for 1.37.0 release. (diff) | |
Prepare for 1.37.1 release and fix CI.v1.37.1
| -rw-r--r-- | .github/workflows/test.yml | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | build_win.bat | 3 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/conf/janetconf.h | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e832e7fc..4a385ab3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,6 +38,9 @@ jobs: - name: Test the project shell: cmd run: build_win test + - name: Test installer build + shell: cmd + run: build_win dist test-windows-min: name: Build and test on Windows Minimal build diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c5e80b..7c36f2f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog All notable changes to this project will be documented in this file. -## 1.37.0 - 2024-12-05 +## 1.37.1 - 2024-12-05 - Fix meson cross compilation - Update timeout documentation for networking APIs: timeouts raise errors and do not return nil. - Add `janet_addtimeout_nil(double sec);` to the C API. diff --git a/build_win.bat b/build_win.bat index 2a3d06cb..a53d4931 100644 --- a/build_win.bat +++ b/build_win.bat @@ -138,7 +138,8 @@ if defined APPVEYOR_REPO_TAG_NAME ( set RELEASE_VERSION=%JANET_VERSION% ) if defined CI ( - set WIXBIN="c:\Program Files (x86)\WiX Toolset v3.11\bin\" + set WIXBIN="%WIX%bin\" + echo WIXBIN = %WIXBIN% ) else ( set WIXBIN= ) diff --git a/meson.build b/meson.build index 0e829057..d06102e4 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.37.0') + version : '1.37.1') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 4ac3f0cf..7fc77bc0 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -5,9 +5,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 37 -#define JANET_VERSION_PATCH 0 +#define JANET_VERSION_PATCH 1 #define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.37.0" +#define JANET_VERSION "1.37.1" /* #define JANET_BUILD "local" */ |