diff --git a/.github/workflows/package_test.yml b/.github/workflows/package_test.yml new file mode 100644 index 00000000..7bc8dbbf --- /dev/null +++ b/.github/workflows/package_test.yml @@ -0,0 +1,37 @@ +name: Package test + +on: + push: + +jobs: + package_test: + if: github.repository == 'tarantool/luatest' + + strategy: + fail-fast: false + matrix: + dist: [ ubuntu ] + version: [ jammy ] + + runs-on: ubuntu-20.04 + + steps: + - name: Check out repo + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Check out packpack + uses: actions/checkout@v3 + with: + repository: packpack/packpack + path: packpack + + - name: Set package version + run: echo "VERSION=$(git describe --always --long)" >> $GITHUB_ENV + + - name: Run packaging + run: ./packpack/packpack + env: + OS: ${{ matrix.dist }} + DIST: ${{ matrix.version }} diff --git a/debian/changelog b/debian/changelog index ac2efe62..9a74f152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 28 Jan 2022 14:00:00 +0300 + -- Nikolay Volynkin Fri, 28 Jan 2022 14:00:00 +0300 luatest (0.5.6-1) unstable; urgency=medium @@ -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 Thu, 25 Jun 2020 13:00:00 +0300 diff --git a/debian/compat b/debian/compat index ec635144..f599e28b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 39dd6d13..1c1d2b6f 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,13 @@ Source: luatest Priority: optional Section: database Maintainer: Konstantin Nazarov -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 diff --git a/debian/docs b/debian/docs index b43bf86b..a1320b1b 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README.md +README.rst diff --git a/debian/prebuild.sh b/debian/prebuild.sh index 479bf20a..e4778e40 100755 --- a/debian/prebuild.sh +++ b/debian/prebuild.sh @@ -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 diff --git a/debian/rules b/debian/rules index 0db7e509..201fa870 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/test/capturing_test.lua b/test/capturing_test.lua index da81cda0..c62cc0cf 100644 --- a/test/capturing_test.lua +++ b/test/capturing_test.lua @@ -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