From 3a6abfad30dafcb1f39a12e6ee74f197cb776abf Mon Sep 17 00:00:00 2001 From: "Alexandru N. Onea" Date: Tue, 9 Apr 2019 01:23:10 +0300 Subject: Initial version-bump.sh --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d7e3a99..dda722d 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project ('tinyalsa', 'c', - version : run_command(find_program('scripts/version.py')).stdout().strip(), + version : run_command(find_program('scripts/version-bump.sh'), 'print', '-s').stdout().strip(), meson_version : '>= 0.48.0') tinyalsa_includes = include_directories('.', 'include') -- cgit v1.2.3 From 52a7957cabc961d25b2eb765c34ca4e06844e197 Mon Sep 17 00:00:00 2001 From: "Alexandru N. Onea" Date: Tue, 9 Apr 2019 21:51:27 +0300 Subject: Add check action to version-bump.sh; Activate checks --- meson.build | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index dda722d..04edda5 100644 --- a/meson.build +++ b/meson.build @@ -10,6 +10,13 @@ tinyalsa = library('tinyalsa', version: meson.project_version(), install: true) +log_version = run_command(find_program('scripts/version-bump.sh'), 'check') +if log_version.returncode() != 0 + error(log_version.stderr()) +endif + +message(log_version.stdout()) + # For use as a Meson subproject tinyalsa_dep = declare_dependency(link_with: tinyalsa, include_directories: include_directories('include')) -- cgit v1.2.3 From a6838a0c6955a5803ca1b15338b971292c3e824b Mon Sep 17 00:00:00 2001 From: "Alexandru N. Onea" Date: Wed, 10 Apr 2019 01:00:58 +0300 Subject: Rename version-bump to just version --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 04edda5..7762706 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project ('tinyalsa', 'c', - version : run_command(find_program('scripts/version-bump.sh'), 'print', '-s').stdout().strip(), + version : run_command(find_program('scripts/version.sh'), 'print', '-s').stdout().strip(), meson_version : '>= 0.48.0') tinyalsa_includes = include_directories('.', 'include') @@ -10,7 +10,7 @@ tinyalsa = library('tinyalsa', version: meson.project_version(), install: true) -log_version = run_command(find_program('scripts/version-bump.sh'), 'check') +log_version = run_command(find_program('scripts/version.sh'), 'check') if log_version.returncode() != 0 error(log_version.stderr()) endif -- cgit v1.2.3 From 1830893d7b0c43e53da0e4c50449cf7826101614 Mon Sep 17 00:00:00 2001 From: "Alexandru N. Onea" Date: Thu, 11 Apr 2019 12:56:54 +0300 Subject: Move changelog check ver. from build systems to CI This commit moves the changelog version check to the CI instead of the build systems. Rationale is: the failure to update the changelog is not a build failure / issue but rather an integration failure and it should be detected at integration testing. The closest to integration testing is the CI testing which is mandatory before pull requests and new features integration. Additionally, the old version.py script is removed because it is relying on the old version of include/tinyalsa/version.h where the TINYALSA_VERSION_STRING macro is defiend as an explicit string literal. Since now the version string is defined piece-wise and based on the individual version numbers, and since the introduction of version.sh and its use within meson build system to get the version from the version file, the old version.py script is obsolete. --- meson.build | 7 ------- 1 file changed, 7 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 7762706..abbca8e 100644 --- a/meson.build +++ b/meson.build @@ -10,13 +10,6 @@ tinyalsa = library('tinyalsa', version: meson.project_version(), install: true) -log_version = run_command(find_program('scripts/version.sh'), 'check') -if log_version.returncode() != 0 - error(log_version.stderr()) -endif - -message(log_version.stdout()) - # For use as a Meson subproject tinyalsa_dep = declare_dependency(link_with: tinyalsa, include_directories: include_directories('include')) -- cgit v1.2.3