From e0c5a41ffaf9da37440ddb4cfab66cf42f2a5125 Mon Sep 17 00:00:00 2001
From: Yaroslav Lobankov <y.lobankov@tarantool.org>
Date: Mon, 27 Feb 2023 16:55:26 +0400
Subject: [PATCH] ci: eliminate 1.10 related logic for workflows
The 1.10 branch is not supported anymore and there is no need to keep
the logic for it.
NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
---
.github/actions/pack-and-deploy/action.yml | 9 +---
.github/workflows/alpine_3_16.yml | 1 -
.github/workflows/alpine_3_16_aarch64.yml | 1 -
.github/workflows/centos_7.yml | 1 -
.github/workflows/centos_7_aarch64.yml | 1 -
.github/workflows/centos_8.yml | 1 -
.github/workflows/centos_8_aarch64.yml | 1 -
.github/workflows/coverage.yml | 1 -
.github/workflows/debian_10.yml | 1 -
.github/workflows/debian_10_aarch64.yml | 1 -
.github/workflows/debian_11.yml | 1 -
.github/workflows/debian_11_aarch64.yml | 1 -
.github/workflows/debian_9.yml | 1 -
.github/workflows/debug.yml | 1 -
.github/workflows/debug_aarch64.yml | 1 -
.github/workflows/default_gcc_centos_7.yml | 1 -
.github/workflows/fedora_34.yml | 1 -
.github/workflows/fedora_34_aarch64.yml | 1 -
.github/workflows/fedora_35.yml | 1 -
.github/workflows/fedora_35_aarch64.yml | 1 -
.github/workflows/fedora_36.yml | 1 -
.github/workflows/fedora_36_aarch64.yml | 1 -
.github/workflows/freebsd-12.yml | 1 -
.github/workflows/freebsd-13.yml | 1 -
.github/workflows/fuzzing.yml | 1 -
.github/workflows/integration.yml | 1 -
.github/workflows/lint.yml | 1 -
.../memtx_allocator_based_on_malloc.yml | 1 -
.github/workflows/osx_debug.yml | 1 -
.github/workflows/osx_release.yml | 1 -
.github/workflows/osx_release_lto.yml | 1 -
.github/workflows/osx_static_cmake.yml | 1 -
.github/workflows/out_of_source.yml | 1 -
.github/workflows/publish-module-api-doc.yaml | 1 -
.github/workflows/redos_7_3.yaml | 1 -
.github/workflows/release.yml | 1 -
.github/workflows/release_asan_clang11.yml | 1 -
.github/workflows/release_clang.yml | 1 -
.github/workflows/release_lto.yml | 1 -
.github/workflows/release_lto_clang11.yml | 1 -
.github/workflows/static_build.yml | 1 -
.../workflows/static_build_cmake_linux.yml | 1 -
.github/workflows/ubuntu_16_04.yml | 1 -
.github/workflows/ubuntu_18_04.yml | 1 -
.github/workflows/ubuntu_20_04.yml | 1 -
.github/workflows/ubuntu_20_04_aarch64.yml | 1 -
.github/workflows/ubuntu_22_04.yml | 1 -
.github/workflows/ubuntu_22_04_aarch64.yml | 1 -
.pack.mk | 50 ++++++++-----------
49 files changed, 22 insertions(+), 84 deletions(-)
diff --git a/.github/actions/pack-and-deploy/action.yml b/.github/actions/pack-and-deploy/action.yml
index dd669f1885..4bda5fe025 100644
--- a/.github/actions/pack-and-deploy/action.yml
+++ b/.github/actions/pack-and-deploy/action.yml
@@ -12,22 +12,15 @@ runs:
# Create packages.
make -f .pack.mk package
- # Deploy live packages. Enabled only for 1.10 branch.
- if ${{ github.ref == 'refs/heads/1.10' }}; then
- REPO_TYPE=live make -f .pack.mk deploy
- fi
-
# Deploy pre-release (since 2.10) and release packages. It's expected
# that no one will push tags are used for pre-releases and releases.
- if ${{ ( startsWith(github.ref, 'refs/tags/1.10.') ||
- startsWith(github.ref, 'refs/tags/2.') ) &&
+ if ${{ startsWith(github.ref, 'refs/tags/2.') &&
!endsWith(github.ref, '-entrypoint') }}; then
case ${{ github.ref }} in
# It's relevant since 2.10 only.
refs/tags/*-alpha*|refs/tags/*-beta*|refs/tags/*-rc*)
REPO_TYPE=pre-release make -f .pack.mk deploy
;;
-
refs/tags/*)
REPO_TYPE=release make -f .pack.mk deploy
;;
diff --git a/.github/workflows/alpine_3_16.yml b/.github/workflows/alpine_3_16.yml
index 9b2530987f..a8f00ba860 100644
--- a/.github/workflows/alpine_3_16.yml
+++ b/.github/workflows/alpine_3_16.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/alpine_3_16_aarch64.yml b/.github/workflows/alpine_3_16_aarch64.yml
index 61251ff57f..299a74f32b 100644
--- a/.github/workflows/alpine_3_16_aarch64.yml
+++ b/.github/workflows/alpine_3_16_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/centos_7.yml b/.github/workflows/centos_7.yml
index c0f73747b2..980c7bfeb8 100644
--- a/.github/workflows/centos_7.yml
+++ b/.github/workflows/centos_7.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/centos_7_aarch64.yml b/.github/workflows/centos_7_aarch64.yml
index a2d17a40d4..9a7b5c6c59 100644
--- a/.github/workflows/centos_7_aarch64.yml
+++ b/.github/workflows/centos_7_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/centos_8.yml b/.github/workflows/centos_8.yml
index 4296d3eb76..ee95e88621 100644
--- a/.github/workflows/centos_8.yml
+++ b/.github/workflows/centos_8.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/centos_8_aarch64.yml b/.github/workflows/centos_8_aarch64.yml
index 085cb254b3..6a1ba01607 100644
--- a/.github/workflows/centos_8_aarch64.yml
+++ b/.github/workflows/centos_8_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 6854930fc3..2699f117cf 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -23,7 +23,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debian_10.yml b/.github/workflows/debian_10.yml
index 6741852976..00bab4fc64 100644
--- a/.github/workflows/debian_10.yml
+++ b/.github/workflows/debian_10.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debian_10_aarch64.yml b/.github/workflows/debian_10_aarch64.yml
index b88f6de412..02c76a90d3 100644
--- a/.github/workflows/debian_10_aarch64.yml
+++ b/.github/workflows/debian_10_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debian_11.yml b/.github/workflows/debian_11.yml
index 06cd304902..354bcc9a6b 100644
--- a/.github/workflows/debian_11.yml
+++ b/.github/workflows/debian_11.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debian_11_aarch64.yml b/.github/workflows/debian_11_aarch64.yml
index 4336b0fd30..b0426df779 100644
--- a/.github/workflows/debian_11_aarch64.yml
+++ b/.github/workflows/debian_11_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debian_9.yml b/.github/workflows/debian_9.yml
index e933ad76a1..60fdfbc4b9 100644
--- a/.github/workflows/debian_9.yml
+++ b/.github/workflows/debian_9.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index fda93659f8..b972c26e6a 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -23,7 +23,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/debug_aarch64.yml b/.github/workflows/debug_aarch64.yml
index 033e31a70a..e9d18ec99a 100644
--- a/.github/workflows/debug_aarch64.yml
+++ b/.github/workflows/debug_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/default_gcc_centos_7.yml b/.github/workflows/default_gcc_centos_7.yml
index 1d106b9192..ed3893ce5d 100644
--- a/.github/workflows/default_gcc_centos_7.yml
+++ b/.github/workflows/default_gcc_centos_7.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_34.yml b/.github/workflows/fedora_34.yml
index 7d1ddc19f0..cf3c04510a 100644
--- a/.github/workflows/fedora_34.yml
+++ b/.github/workflows/fedora_34.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_34_aarch64.yml b/.github/workflows/fedora_34_aarch64.yml
index 929f30f43d..d13f2ca09a 100644
--- a/.github/workflows/fedora_34_aarch64.yml
+++ b/.github/workflows/fedora_34_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_35.yml b/.github/workflows/fedora_35.yml
index facef9c1d7..cdd386e3e2 100644
--- a/.github/workflows/fedora_35.yml
+++ b/.github/workflows/fedora_35.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_35_aarch64.yml b/.github/workflows/fedora_35_aarch64.yml
index 1cc74d1174..14ae731736 100644
--- a/.github/workflows/fedora_35_aarch64.yml
+++ b/.github/workflows/fedora_35_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_36.yml b/.github/workflows/fedora_36.yml
index c2ae38907b..8065c27252 100644
--- a/.github/workflows/fedora_36.yml
+++ b/.github/workflows/fedora_36.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fedora_36_aarch64.yml b/.github/workflows/fedora_36_aarch64.yml
index 79ced5dfbd..f80284aac1 100644
--- a/.github/workflows/fedora_36_aarch64.yml
+++ b/.github/workflows/fedora_36_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/freebsd-12.yml b/.github/workflows/freebsd-12.yml
index 9c1e8ece55..78944779c8 100644
--- a/.github/workflows/freebsd-12.yml
+++ b/.github/workflows/freebsd-12.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/freebsd-13.yml b/.github/workflows/freebsd-13.yml
index a80bfa7d65..ee8b01c299 100644
--- a/.github/workflows/freebsd-13.yml
+++ b/.github/workflows/freebsd-13.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
index 447074d448..1928a72426 100644
--- a/.github/workflows/fuzzing.yml
+++ b/.github/workflows/fuzzing.yml
@@ -28,7 +28,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index e7420342e4..bade88903f 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 033f1931e5..d54f6887a2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -23,7 +23,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/memtx_allocator_based_on_malloc.yml b/.github/workflows/memtx_allocator_based_on_malloc.yml
index 8ea6fc35c2..07c037ec88 100644
--- a/.github/workflows/memtx_allocator_based_on_malloc.yml
+++ b/.github/workflows/memtx_allocator_based_on_malloc.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/osx_debug.yml b/.github/workflows/osx_debug.yml
index a53e0c6781..099ec1e262 100644
--- a/.github/workflows/osx_debug.yml
+++ b/.github/workflows/osx_debug.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/osx_release.yml b/.github/workflows/osx_release.yml
index fb18179ab7..a2188eb4a0 100644
--- a/.github/workflows/osx_release.yml
+++ b/.github/workflows/osx_release.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/osx_release_lto.yml b/.github/workflows/osx_release_lto.yml
index f811393166..bae8bbe426 100644
--- a/.github/workflows/osx_release_lto.yml
+++ b/.github/workflows/osx_release_lto.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/osx_static_cmake.yml b/.github/workflows/osx_static_cmake.yml
index 3602976ba0..5261e6f724 100644
--- a/.github/workflows/osx_static_cmake.yml
+++ b/.github/workflows/osx_static_cmake.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/out_of_source.yml b/.github/workflows/out_of_source.yml
index 0317e9a1b4..f255c7ef96 100644
--- a/.github/workflows/out_of_source.yml
+++ b/.github/workflows/out_of_source.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/publish-module-api-doc.yaml b/.github/workflows/publish-module-api-doc.yaml
index 409c32f0a1..e17cdb1864 100644
--- a/.github/workflows/publish-module-api-doc.yaml
+++ b/.github/workflows/publish-module-api-doc.yaml
@@ -20,7 +20,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/redos_7_3.yaml b/.github/workflows/redos_7_3.yaml
index ee027fdcb4..4fee2ec5c7 100644
--- a/.github/workflows/redos_7_3.yaml
+++ b/.github/workflows/redos_7_3.yaml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b69746462f..1653103ea5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/release_asan_clang11.yml b/.github/workflows/release_asan_clang11.yml
index 1bb61b3d33..10a51f1fba 100644
--- a/.github/workflows/release_asan_clang11.yml
+++ b/.github/workflows/release_asan_clang11.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/release_clang.yml b/.github/workflows/release_clang.yml
index e32cd3b1e2..a61e5b18cf 100644
--- a/.github/workflows/release_clang.yml
+++ b/.github/workflows/release_clang.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/release_lto.yml b/.github/workflows/release_lto.yml
index ae1daa2b82..18516eb605 100644
--- a/.github/workflows/release_lto.yml
+++ b/.github/workflows/release_lto.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/release_lto_clang11.yml b/.github/workflows/release_lto_clang11.yml
index ca1425d839..56db22631e 100644
--- a/.github/workflows/release_lto_clang11.yml
+++ b/.github/workflows/release_lto_clang11.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/static_build.yml b/.github/workflows/static_build.yml
index d6ad8ca12a..e0edf025bd 100644
--- a/.github/workflows/static_build.yml
+++ b/.github/workflows/static_build.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/static_build_cmake_linux.yml b/.github/workflows/static_build_cmake_linux.yml
index 9cfb5494da..94dbae3918 100644
--- a/.github/workflows/static_build_cmake_linux.yml
+++ b/.github/workflows/static_build_cmake_linux.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_16_04.yml b/.github/workflows/ubuntu_16_04.yml
index 7ea27453e1..833423f6f9 100644
--- a/.github/workflows/ubuntu_16_04.yml
+++ b/.github/workflows/ubuntu_16_04.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_18_04.yml b/.github/workflows/ubuntu_18_04.yml
index 35035c3ada..0df0447694 100644
--- a/.github/workflows/ubuntu_18_04.yml
+++ b/.github/workflows/ubuntu_18_04.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml
index 5384ea118d..914c570a17 100644
--- a/.github/workflows/ubuntu_20_04.yml
+++ b/.github/workflows/ubuntu_20_04.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_20_04_aarch64.yml b/.github/workflows/ubuntu_20_04_aarch64.yml
index 187809774c..7d17a7af8e 100644
--- a/.github/workflows/ubuntu_20_04_aarch64.yml
+++ b/.github/workflows/ubuntu_20_04_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_22_04.yml b/.github/workflows/ubuntu_22_04.yml
index cea416ab05..512c2a6a8d 100644
--- a/.github/workflows/ubuntu_22_04.yml
+++ b/.github/workflows/ubuntu_22_04.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.github/workflows/ubuntu_22_04_aarch64.yml b/.github/workflows/ubuntu_22_04_aarch64.yml
index dddbe8a907..9f62f191c6 100644
--- a/.github/workflows/ubuntu_22_04_aarch64.yml
+++ b/.github/workflows/ubuntu_22_04_aarch64.yml
@@ -24,7 +24,6 @@ concurrency:
# pushing a tag may cancel a run that works on a branch push event.
group: ${{ (
github.ref == 'refs/heads/master' ||
- github.ref == 'refs/heads/1.10' ||
startsWith(github.ref, 'refs/heads/2.') ||
startsWith(github.ref, 'refs/tags/')) &&
format('{0}-{1}', github.run_id, github.run_attempt) ||
diff --git a/.pack.mk b/.pack.mk
index 37ac7acc7a..7af08139b4 100644
--- a/.pack.mk
+++ b/.pack.mk
@@ -16,38 +16,32 @@ VERSION = ${MAJOR_VERSION}.${MINOR_VERSION}
TARANTOOL_SERIES = series-${MAJOR_VERSION}
S3_SOURCE_REPO_URL = s3://tarantool_repo/sources
-ifeq (${VERSION}, $(filter ${VERSION}, 1.10))
- TARANTOOL_SERIES = ${MAJOR_VERSION}.${MINOR_VERSION}
- S3_SOURCE_REPO_URL = s3://tarantool_repo/sources/${TARANTOOL_SERIES}
-endif
prepare:
rm -rf build packpack
git clone https://github.com/packpack/packpack.git
package: prepare
- if [ "${TARANTOOL_SERIES}" != "1.10" ]; then \
- if [ "${OS}" = "alpine" ]; then \
- if [ -n "${GIT_TAG}" ]; then \
- export VERSION="$$(echo ${GIT_TAG} | sed 's/-/_/' | sed 's/entrypoint/alpha0/')"; \
- else \
- RELEASE="$(word 1, $(subst -, ,${GIT_DESCRIBE}))"; \
- TYPE="$(word 2, $(subst -, ,${GIT_DESCRIBE}))"; \
- PATCH="$(word 3, $(subst -, ,${GIT_DESCRIBE}))"; \
- if [ "$${TYPE}" = "entrypoint" ]; then \
- TYPE="alpha0"; \
- fi; \
- export VERSION="$${RELEASE}_$${TYPE}_p$${PATCH}"; \
- fi; \
+ if [ "${OS}" = "alpine" ]; then \
+ if [ -n "${GIT_TAG}" ]; then \
+ export VERSION="$$(echo ${GIT_TAG} | sed 's/-/_/' | sed 's/entrypoint/alpha0/')"; \
else \
- if [ -n "${GIT_TAG}" ]; then \
- export VERSION="$$(echo ${GIT_TAG} | sed 's/-/~/')"; \
- else \
- export VERSION="$$(echo ${GIT_DESCRIBE} | sed ${SED_REPLACE_VERSION_REGEX} | sed 's/-/~/').dev"; \
+ RELEASE="$(word 1, $(subst -, ,${GIT_DESCRIBE}))"; \
+ TYPE="$(word 2, $(subst -, ,${GIT_DESCRIBE}))"; \
+ PATCH="$(word 3, $(subst -, ,${GIT_DESCRIBE}))"; \
+ if [ "$${TYPE}" = "entrypoint" ]; then \
+ TYPE="alpha0"; \
fi; \
+ export VERSION="$${RELEASE}_$${TYPE}_p$${PATCH}"; \
+ fi; \
+ else \
+ if [ -n "${GIT_TAG}" ]; then \
+ export VERSION="$$(echo ${GIT_TAG} | sed 's/-/~/')"; \
+ else \
+ export VERSION="$$(echo ${GIT_DESCRIBE} | sed ${SED_REPLACE_VERSION_REGEX} | sed 's/-/~/').dev"; \
fi; \
- echo VERSION=$${VERSION}; \
fi; \
+ echo VERSION=$${VERSION}; \
PACKPACK_EXTRA_DOCKER_RUN_PARAMS="--network=host --volume ${VARDIR}:${VARDIR} ${PACKPACK_EXTRA_DOCKER_RUN_PARAMS}" \
TARBALL_EXTRA_ARGS="--exclude=*.exe --exclude=*.dll" \
PRESERVE_ENVVARS="TARBALL_EXTRA_ARGS,${PRESERVE_ENVVARS}" \
@@ -82,14 +76,12 @@ deploy:
$${CURL_CMD}
source: prepare
- if [ "${TARANTOOL_SERIES}" != "1.10" ]; then \
- if [ -n "${GIT_TAG}" ]; then \
- export VERSION=${GIT_TAG}; \
- else \
- export VERSION="$$(echo ${GIT_DESCRIBE} | sed ${SED_REPLACE_VERSION_REGEX}).dev"; \
- fi; \
- echo VERSION=$${VERSION}; \
+ if [ -n "${GIT_TAG}" ]; then \
+ export VERSION=${GIT_TAG}; \
+ else \
+ export VERSION="$$(echo ${GIT_DESCRIBE} | sed ${SED_REPLACE_VERSION_REGEX}).dev"; \
fi; \
+ echo VERSION=$${VERSION}; \
TARBALL_COMPRESSOR=gz \
./packpack/packpack tarball
--
GitLab