Skip to content

Commit 2ae9db7

Browse files
committed
Update vars in config.sh when building
1 parent 1178548 commit 2ae9db7

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/build_installation_package.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,19 @@ jobs:
2525
ROOT_GIT_URL: ${{ vars.ROOT_GIT_URL }}
2626
ROOT_GIT_TAG: ${{ vars.ROOT_GIT_TAG }}
2727
run: |
28+
set -x
2829
export DQMGUI_PYTHON_VERSION=$($(which python3) -c 'import platform; print(platform.python_version())' | cut -d'.' -f1,2)
2930
export RELEASE_TAG=python_${DQMGUI_PYTHON_VERSION}_deployment_${DMWM_GIT_TAG}_dqmgui_${DQMGUI_GIT_TAG}_root_${ROOT_GIT_TAG}
3031
sudo apt update && sudo apt install -y libcurl4-gnutls-dev
31-
# Replace python version inside the config, it will matter during installation
32+
# Replace the repos version inside the config, it will matter during installation
3233
sed -Ei "s/PYTHON\_VERSION=[0-9]\.[0-9]{1,2}/PYTHON\_VERSION=${DQMGUI_PYTHON_VERSION}/" config.sh
33-
bash download_dependencies.sh PYTHON_VERSION=$DQMGUI_PYTHON_VERSION DMWM_GIT_TAG=$DMWM_GIT_TAG DMWM_GIT_URL=$DMWM_GIT_URL DQMGUI_GIT_TAG=$DQMGUI_GIT_TAG ROOT_GIT_URL=$ROOT_GIT_URL ROOT_GIT_TAG=$ROOT_GIT_TAG
34+
sed -Ei "s/DMWM\_GIT\_TAG=.+/DMWM\_GIT\_TAG=${DMWM_GIT_TAG}/" config.sh
35+
sed -Ei "s@DMWM\_GIT\_URL=.+@DMWM\_GIT\_URL=${DMWM_GIT_URL}@" config.sh
36+
sed -Ei "s/DQMGUI\_GIT\_TAG=.+/DQMGUI\_GIT\_TAG=${DQMGUI_GIT_TAG}/" config.sh
37+
sed -Ei "s@DQMGUI\_GIT\_URL=.+@DQMGUI\_GIT\_URL=${DQMGUI_GIT_URL}@" config.sh
38+
sed -Ei "s/ROOT\_GIT\_TAG=.+/ROOT\_GIT\_TAG=${ROOT_GIT_TAG}/" config.sh
39+
sed -Ei "s@ROOT\_GIT\_URL=.+@ROOT\_GIT\_URL=${ROOT_GIT_URL}@" config.sh
40+
bash download_dependencies.sh
3441
bash build_installation_package.sh TARGET_DIRECTORY="/tmp/dqmgui" ARCHIVE_NAME="dqmgui_$RELEASE_TAG.tar.gz"
3542
echo "Automatically generated release for making the installation package publicly available.
3643

build_installation_package.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,11 @@ for ARGUMENT in "$@"; do
2020
eval "$KEY=$VALUE"
2121
done
2222

23+
# Check for piggiez
24+
COMPRESSION_CMD="pigz --best"
25+
if ! pigz --version >/dev/null 2>&1; then
26+
COMPRESSION_CMD="gzip --best"
27+
fi
28+
2329
mkdir -p "$TARGET_DIRECTORY"
24-
tar -cf "$TARGET_DIRECTORY/$ARCHIVE_NAME" --exclude "$SOURCE_DIRECTORY/.git" --exclude "$SOURCE_DIRECTORY/.github" "$SOURCE_DIRECTORY" -I "pigz --best"
30+
tar -cf "$TARGET_DIRECTORY/$ARCHIVE_NAME" --exclude "$SOURCE_DIRECTORY/.git" --exclude "$SOURCE_DIRECTORY/.github" "$SOURCE_DIRECTORY" -I "$COMPRESSION_CMD"

0 commit comments

Comments
 (0)