Skip to content

Commit

Permalink
Fix packaging for Debian-based dists
Browse files Browse the repository at this point in the history
  • Loading branch information
ylobankov committed Nov 15, 2023
1 parent 5ad8db1 commit 85d7774
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 12 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/package_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Package test

on:
push:

jobs:
package_test:
if: github.repository == 'tarantool/luatest'

strategy:
fail-fast: false
matrix:
dist: [ ubuntu ]
version: [ focal ]

runs-on: ubuntu-20.04

steps:
- name: Check out repo
uses: actions/checkout@v3

- name: Check out packpack
uses: actions/checkout@v3
with:
repository: packpack/packpack
path: packpack

- name: Run packaging
run: ./packpack/packpack
env:
OS: ${{ matrix.dist }}
DIST: ${{ matrix.version }}
6 changes: 3 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ luatest (0.5.7-1) unstable; urgency=medium
* Change test run summary report: use verbs in past simple tense (succeeded,
failed, xfailed, etc.) instead of nouns (success(es), fail(s), xfail(s), etc.)

-- Nikolay Volynkin <[email protected]> Fri, 28 Jan 2022 14:00:00 +0300
-- Nikolay Volynkin <[email protected]> Fri, 28 Jan 2022 14:00:00 +0300

luatest (0.5.6-1) unstable; urgency=medium

Expand Down Expand Up @@ -51,8 +51,8 @@ luatest (0.5.3-1) unstable; urgency=medium

luatest (0.5.2-1) unstable; urgency=medium

- Throw parser error when .json is accessed on response with invalid body.
- Set `Content-Type: application/json` for `:http_request(..., {json = ...})` requests.
* Throw parser error when .json is accessed on response with invalid body.
* Set `Content-Type: application/json` for `:http_request(..., {json = ...})` requests.

-- Maxim Melentiev <[email protected]> Thu, 25 Jun 2020 13:00:00 +0300

Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
9 changes: 5 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Source: luatest
Priority: optional
Section: database
Maintainer: Konstantin Nazarov <[email protected]>
Build-Depends: debhelper (>= 9), cdbs,
Build-Depends: debhelper (>= 10),
cdbs (>= 0.4.100),
tarantool (>= 1.9.0),
tarantool-dev (>= 1.9.0),
tarantool-checks (>= 3.0.1)
Standards-Version: 3.9.6
tarantool-checks (>= 3.0.1),
tt (>= 1.0.0)
Standards-Version: 4.5.1
Homepage: https://github.com/tarantool/luatest
Vcs-Git: git://github.com/tarantool/luatest.git
Vcs-Browser: https://github.com/tarantool/luatest
Expand Down
2 changes: 1 addition & 1 deletion debian/docs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
README.md
README.rst
2 changes: 1 addition & 1 deletion debian/prebuild.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
curl -s https://packagecloud.io/install/repositories/tarantool/1_10/script.deb.sh | sudo bash
curl -L https://tarantool.io/release/${LUATEST_TARANTOOL_SERIES:-2}/installer.sh | bash
2 changes: 2 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[[:digit:]]\+$$//')
DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVERSION=$(VERSION)

DEB_MAKE_CHECK_TARGET := selftest

include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
4 changes: 2 additions & 2 deletions test/capturing_test.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ end
local function assert_captured(fn)
helper.run_suite(fn)
local captured = capture:flush()
t.assert_not_str_contains(captured.stdout, 'test-')
t.assert_not_str_contains(captured.stderr, 'test-')
t.assert_not_str_contains(captured.stdout, 'test-out')
t.assert_not_str_contains(captured.stderr, 'test-err')
assert_capture_restored()
end

Expand Down

0 comments on commit 85d7774

Please sign in to comment.