From db6bbb59883de2d53a071746f4908406d4fe99ed Mon Sep 17 00:00:00 2001
From: Yaroslav Lobankov <y.lobankov@tarantool.org>
Date: Mon, 30 May 2022 11:48:44 +0300
Subject: [PATCH] ci: fix artifacts gathering for package workflows
In PR #7090 we forgot to update the path to gather failure artifacts for
many packaging workflows. Now it is fixed.
NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
---
.github/workflows/centos_7.yml | 2 +-
.github/workflows/centos_7_aarch64.yml | 2 +-
.github/workflows/centos_8.yml | 2 +-
.github/workflows/centos_8_aarch64.yml | 2 +-
.github/workflows/debian_10.yml | 2 +-
.github/workflows/debian_10_aarch64.yml | 2 +-
.github/workflows/debian_11.yml | 2 +-
.github/workflows/debian_11_aarch64.yml | 2 +-
.github/workflows/debian_9.yml | 2 +-
.github/workflows/default_gcc_centos_7.yml | 4 ++--
.github/workflows/fedora_34.yml | 2 +-
.github/workflows/fedora_34_aarch64.yml | 2 +-
.github/workflows/fedora_35.yml | 2 +-
.github/workflows/fedora_35_aarch64.yml | 2 +-
.github/workflows/opensuse_15_1.yml | 2 +-
.github/workflows/opensuse_15_2.yml | 2 +-
.github/workflows/ubuntu_16_04.yml | 2 +-
.github/workflows/ubuntu_18_04.yml | 2 +-
.github/workflows/ubuntu_20_04.yml | 2 +-
.github/workflows/ubuntu_20_04_aarch64.yml | 2 +-
.github/workflows/ubuntu_21_10.yml | 2 +-
.gitlab.mk | 2 +-
22 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/centos_7.yml b/.github/workflows/centos_7.yml
index 4321e1c351..66ac7bc27e 100644
--- a/.github/workflows/centos_7.yml
+++ b/.github/workflows/centos_7.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: centos-7
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/centos_7_aarch64.yml b/.github/workflows/centos_7_aarch64.yml
index 18bda8a562..cbc35c737a 100644
--- a/.github/workflows/centos_7_aarch64.yml
+++ b/.github/workflows/centos_7_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: centos-7
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/centos_8.yml b/.github/workflows/centos_8.yml
index cb20b0d2fb..70d80d3a3c 100644
--- a/.github/workflows/centos_8.yml
+++ b/.github/workflows/centos_8.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: centos-8
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/centos_8_aarch64.yml b/.github/workflows/centos_8_aarch64.yml
index 17fa4612b9..c4cb1a20cf 100644
--- a/.github/workflows/centos_8_aarch64.yml
+++ b/.github/workflows/centos_8_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: centos-8
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/debian_10.yml b/.github/workflows/debian_10.yml
index 25727612e3..bab139c648 100644
--- a/.github/workflows/debian_10.yml
+++ b/.github/workflows/debian_10.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: debian-buster
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/debian_10_aarch64.yml b/.github/workflows/debian_10_aarch64.yml
index f5b5661930..2c1ff25179 100644
--- a/.github/workflows/debian_10_aarch64.yml
+++ b/.github/workflows/debian_10_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: debian-buster
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/debian_11.yml b/.github/workflows/debian_11.yml
index 9a7056e3a7..159f09587a 100644
--- a/.github/workflows/debian_11.yml
+++ b/.github/workflows/debian_11.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: debian-bullseye
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/debian_11_aarch64.yml b/.github/workflows/debian_11_aarch64.yml
index ee3c353375..d1a3d6f905 100644
--- a/.github/workflows/debian_11_aarch64.yml
+++ b/.github/workflows/debian_11_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: debian-bullseye
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/debian_9.yml b/.github/workflows/debian_9.yml
index 2d09923570..6e2886a51b 100644
--- a/.github/workflows/debian_9.yml
+++ b/.github/workflows/debian_9.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: debian-stretch
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/default_gcc_centos_7.yml b/.github/workflows/default_gcc_centos_7.yml
index 924e53a752..627b87670d 100644
--- a/.github/workflows/default_gcc_centos_7.yml
+++ b/.github/workflows/default_gcc_centos_7.yml
@@ -32,7 +32,7 @@ concurrency:
cancel-in-progress: true
env:
- CI_MAKE: make -f .travis.mk
+ CI_MAKE: make -f .gitlab.mk
jobs:
default_gcc_centos_7:
@@ -69,4 +69,4 @@ jobs:
with:
name: default_gcc_centos_7
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/fedora_34.yml b/.github/workflows/fedora_34.yml
index d61971c660..78b32fadd8 100644
--- a/.github/workflows/fedora_34.yml
+++ b/.github/workflows/fedora_34.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: fedora-34
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/fedora_34_aarch64.yml b/.github/workflows/fedora_34_aarch64.yml
index 6588d0b8bc..ec8bc34eeb 100644
--- a/.github/workflows/fedora_34_aarch64.yml
+++ b/.github/workflows/fedora_34_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: fedora-34
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/fedora_35.yml b/.github/workflows/fedora_35.yml
index e2c43f102f..db7d3920b9 100644
--- a/.github/workflows/fedora_35.yml
+++ b/.github/workflows/fedora_35.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: fedora-35
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/fedora_35_aarch64.yml b/.github/workflows/fedora_35_aarch64.yml
index 6f0bf41bbb..7d630b06a9 100644
--- a/.github/workflows/fedora_35_aarch64.yml
+++ b/.github/workflows/fedora_35_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: fedora-35
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/opensuse_15_1.yml b/.github/workflows/opensuse_15_1.yml
index c0a8d87593..c4b8dc78e9 100644
--- a/.github/workflows/opensuse_15_1.yml
+++ b/.github/workflows/opensuse_15_1.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: opensuse-leap-15.1
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/opensuse_15_2.yml b/.github/workflows/opensuse_15_2.yml
index 3d4e3c741d..a1fad19782 100644
--- a/.github/workflows/opensuse_15_2.yml
+++ b/.github/workflows/opensuse_15_2.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: opensuse-leap-15.2
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/ubuntu_16_04.yml b/.github/workflows/ubuntu_16_04.yml
index 8bd6cc2f43..d993533d1b 100644
--- a/.github/workflows/ubuntu_16_04.yml
+++ b/.github/workflows/ubuntu_16_04.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: ubuntu-xenial
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/ubuntu_18_04.yml b/.github/workflows/ubuntu_18_04.yml
index 0e7bcbad44..04134791a4 100644
--- a/.github/workflows/ubuntu_18_04.yml
+++ b/.github/workflows/ubuntu_18_04.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: ubuntu-bionic
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml
index 67d032123c..8d3b15d79c 100644
--- a/.github/workflows/ubuntu_20_04.yml
+++ b/.github/workflows/ubuntu_20_04.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: ubuntu-focal
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/ubuntu_20_04_aarch64.yml b/.github/workflows/ubuntu_20_04_aarch64.yml
index c92c9b5ea7..81d494da75 100644
--- a/.github/workflows/ubuntu_20_04_aarch64.yml
+++ b/.github/workflows/ubuntu_20_04_aarch64.yml
@@ -65,4 +65,4 @@ jobs:
with:
name: ubuntu-focal
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/ubuntu_21_10.yml b/.github/workflows/ubuntu_21_10.yml
index 0868cf58c1..95194e9cc5 100644
--- a/.github/workflows/ubuntu_21_10.yml
+++ b/.github/workflows/ubuntu_21_10.yml
@@ -71,4 +71,4 @@ jobs:
with:
name: ubuntu-impish
retention-days: 21
- path: build/usr/src/*/tarantool-*/test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.gitlab.mk b/.gitlab.mk
index e1c206c4ea..0edfa53130 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -115,7 +115,7 @@ package: deploy_prepare
export VERSION="$$(echo $(GIT_DESCRIBE) | sed 's/-\([0-9]\+\)-g[0-9a-f]\+$$/.\1/' | sed 's/-/~/').dev"; \
fi; \
echo VERSION=$$VERSION; \
- PACKPACK_EXTRA_DOCKER_RUN_PARAMS="--network=host ${PACKPACK_EXTRA_DOCKER_RUN_PARAMS}" \
+ PACKPACK_EXTRA_DOCKER_RUN_PARAMS="--network=host --volume /tmp/t:/tmp/t ${PACKPACK_EXTRA_DOCKER_RUN_PARAMS}" \
TARBALL_EXTRA_ARGS="--exclude=*.exe --exclude=*.dll" \
PRESERVE_ENVVARS="TARBALL_EXTRA_ARGS,${PRESERVE_ENVVARS}" ./packpack/packpack
--
GitLab