From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C169F469710 for ; Sun, 7 Jun 2020 16:40:42 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Sun, 7 Jun 2020 16:40:40 +0300 Message-Id: <624bfee981237f22842b083fb3e0093b9c06e780.1591536783.git.avtikhon@tarantool.org> Subject: [Tarantool-patches] [PATCH v1] gitlab-ci: add packaging for Fedora 32 List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko Added packaging jobs for Fedora 32. Closes #4966 (cherry picked from commit 5613beedf83a679b725cea816a4176eabe3e1601) Also added job to travis-ci. --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4966-fedora-32-old-full-ci Issue: https://github.com/tarantool/tarantool/issues/4966 The patch should be committed only after commit bdd90686f82ec2e22d4ea7adfb9a6173bcc8af4a will be pushed to be able to fix Fedoar 32 build. Also current fix is on for 1.10 branch only, for other branches need to make changes in .travis.yml changes: 2.4: 1.10 -> 2.4 2.3: 1.10 -> 2.3 2.2: 1.10 -> 2.2 For master branch .travis.yml doesn't need to be updated. Use 5613beedf83a679b725cea816a4176eabe3e1601 for master branch. .gitlab-ci.yml | 12 ++++++++++++ .travis.yml | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf445c638..fc0539927 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -328,6 +328,12 @@ fedora_31: OS: 'fedora' DIST: '31' +fedora_32: + <<: *pack_test_definition + variables: + OS: 'fedora' + DIST: '32' + ubuntu_14_04: <<: *pack_definition variables: @@ -425,6 +431,12 @@ fedora_31_deploy: OS: 'fedora' DIST: '31' +fedora_32_deploy: + <<: *deploy_test_definition + variables: + OS: 'fedora' + DIST: '32' + ubuntu_14_04_deploy: <<: *deploy_definition variables: diff --git a/.travis.yml b/.travis.yml index a09f511dc..4cf2428ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,9 @@ jobs: - name: "Fedora 31 build + test + deploy RPM" env: OS=fedora DIST=31 if: branch = "1.10" + - name: "Fedora 32 build + test + deploy RPM" + env: OS=fedora DIST=32 + if: branch = "1.10" - name: "Ubuntu Trusty (14.04) build + deploy DEB" env: OS=ubuntu DIST=trusty if: branch = "1.10" -- 2.17.1