Skip to content
Snippets Groups Projects
Unverified Commit 6e2fa5d2 authored by Yaroslav Lobankov's avatar Yaroslav Lobankov
Browse files

ci: follow-up improvements for gc64 builds 

This change contains the following improvements:

1. Prettify view in the job list.

   Before:
     - centos_7 / centos_7 (GC64=OFF)
     - centos_7 / centos_7 (GC64=ON)

   After:
     - centos_7 / centos_7
     - centos_7 / centos_7 (gc64)

2. Change possible values for the ${GC64} env variable to
   `true/false` instead of `ON/OFF` which is more traditional.

3. Use `-DLUAJIT_ENABLE_GC64=ON` flag in the `debian/rules` and
   `rpm/tarantool.spec` files directly instead of providing it
   in the workflow files.

Follows-up tarantool/tarantool-qa#159
Follows-up tarantool/tarantool-qa#161

NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci

(cherry picked from commit 63bedc76)
parent a9e17388
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 41 deletions
.github/workflows/centos_7.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'el'
DIST: '7'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/centos_8.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'el'
DIST: '8'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/debian_10.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'debian'
DIST: 'buster'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/debian_11.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'debian'
DIST: 'bullseye'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/debian_9.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'debian'
DIST: 'stretch'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_30.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '30'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_31.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '31'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_32.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '32'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_33.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '33'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_34.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '34'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/fedora_35.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'fedora'
DIST: '35'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/opensuse_15_1.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'opensuse-leap'
DIST: '15.1'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/opensuse_15_2.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'opensuse-leap'
DIST: '15.2'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/ubuntu_16_04.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'ubuntu'
DIST: 'xenial'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/ubuntu_18_04.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'ubuntu'
DIST: 'bionic'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/ubuntu_20_04.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'ubuntu'
DIST: 'focal'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/ubuntu_21_04.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'ubuntu'
DIST: 'hirsute'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.github/workflows/ubuntu_21_10.yml
+ 2
− 2
View file @ 6e2fa5d2
......@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gc64: [ "GC64=OFF", "GC64=ON" ]
build-type: [ '', 'gc64' ]
steps:
- uses: actions/checkout@v2.3.4
......@@ -57,7 +57,7 @@ jobs:
RWS_AUTH: ${{ secrets.RWS_AUTH }}
OS: 'ubuntu'
DIST: 'impish'
GC64: -DLUAJIT_ENABLE_${{ matrix.gc64 }}
GC64: ${{ matrix.build-type == 'gc64' }}
uses: ./.github/actions/pack_and_deploy
- name: call action to send Telegram message on failure
env:
......
.gitlab.mk
+ 1
− 1
View file @ 6e2fa5d2
......@@ -125,7 +125,7 @@ deploy:
exit 1; \
fi; \
# Use different repos for vanilla and GC64 version.
if [ "$$(echo ${GC64} | sed 's/.*=//')" = ON ]; then \
if [ "${GC64}" = "true" ]; then \
RWS_ENDPOINT=${RWS_BASE_URL}/${REPO_TYPE}/${TARANTOOL_SERIES}-gc64/${OS}/${DIST}; \
else \
RWS_ENDPOINT=${RWS_BASE_URL}/${REPO_TYPE}/${TARANTOOL_SERIES}/${OS}/${DIST}; \
......
debian/rules
+ 3
− 4
View file @ 6e2fa5d2
......@@ -19,10 +19,9 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SYSVINIT=ON \
-DWITH_SYSTEMD=$(WITH_SYSTEMD)
# Append CMAKE flag with -DLUAJIT_ENABLE_GC64 value. It is required
# for CI to build Tarantool with GC64 enabled or disabled dynamically.
ifneq ($(GC64),)
DEB_CMAKE_EXTRA_FLAGS += $(GC64)
# Append -DLUAJIT_ENABLE_GC64=ON flag if ${GC64} env variable is 'true'.
ifeq ($(GC64), true)
DEB_CMAKE_EXTRA_FLAGS += -DLUAJIT_ENABLE_GC64=ON
endif
# Install tarantool.service within tarantool-common package, but does not
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment