Merge 897a519 into 1979089

tarantool · Mar 7, 2023 · ec94479 · ec94479
2 parents 1979089 + 897a519
commit ec94479
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 0 deletions.
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -10,8 +10,17 @@ on:
       - '*'
 
 jobs:
+  version-check:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check module version
+        uses: tarantool/actions/check-module-version@igrishnov/gh-204-add-hardcoded-versioning-support
+        with:
+          module-name: 'http.server'
+
   package:
     runs-on: ubuntu-latest
+    needs: version-check
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -6,8 +6,17 @@ on:
     tags: ['*']
 
 jobs:
+  version-check:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check module version
+        uses: tarantool/actions/check-module-version@igrishnov/gh-204-add-hardcoded-versioning-support
+        with:
+          module-name: 'http.server'
+
   publish-scm-1:
     if: github.ref == 'refs/heads/master'
+    needs: version-check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -18,6 +27,7 @@ jobs:
 
   publish-tag:
     if: startsWith(github.ref, 'refs/tags/')
+    needs: version-check
     runs-on: ubuntu-latest
     steps:
       # Create a source tarball for the release (.src.rock).

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Add versioning support.
+
 ## [1.4.0] - 2022-12-30
 
 ### Added

diff --git a/http/CMakeLists.txt b/http/CMakeLists.txt
@@ -13,5 +13,6 @@ set_target_properties(httpd
 # Install
 install(TARGETS httpd LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/http)
 install(FILES server.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/http)
+install(FILES version.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/http)
 install(FILES mime_types.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/http)
 install(FILES codes.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/http)
diff --git a/http/server.lua b/http/server.lua
@@ -1294,6 +1294,7 @@ local function httpd_start(self)
 end
 
 local exports = {
+    _VERSION = require('http.version'),
     DETACHED = DETACHED,
 
     new = function(host, port, options)

diff --git a/http/version.lua b/http/version.lua
@@ -0,0 +1,4 @@
+-- Сontains the module version.
+-- Requires manual update in case of release commit.
+
+return '1.4.0'