Rename before_install_*.sh to just install_*.sh

It doesn't make sense to call these scripts "before install" because
they do actually install things themselves.

In fact the whole separation into "install" and "before build" is
probably not very useful, but keep it as long as we keep using Travis CI
at all, as it maps better to its config file keys.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-03-19 03:02:41 +01:00
parent 9c2e048bf9
commit 48c0cd4e9c
9 changed files with 10 additions and 10 deletions

View File

@@ -86,12 +86,12 @@ jobs:
set_env_var TEST_RELEASE_PACKAGE YES
fi
- name: Before install
- name: Install dependencies
env:
SOCI_CI_PACKAGES: cmake
run: ./scripts/ci/before_install.sh
run: ./scripts/ci/install.sh
- name: Before build
- name: Prepare for build
run: ./scripts/ci/before_build.sh
- name: Build

View File

@@ -56,7 +56,7 @@ addons:
build_command: "make -j 4"
branch_pattern: coverity_scan
before_install: ./scripts/ci/before_install.sh
before_install: ./scripts/ci/install.sh
before_script: ./scripts/ci/before_build.sh
script: ./scripts/ci/build.sh && ./scripts/ci/test.sh

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Run before_install actions for SOCI build in CI builds
# Run install actions for SOCI build in CI builds
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
@@ -13,8 +13,8 @@ fi
sudo apt-get update -qq -y
sudo apt-get install -qq -y ${packages_to_install}
before_install="${SOCI_SOURCE_DIR}/scripts/ci/before_install_${SOCI_CI_BACKEND}.sh"
if [ -x ${before_install} ]; then
echo "Running ${before_install}"
${before_install}
install_script="${SOCI_SOURCE_DIR}/scripts/ci/install_${SOCI_CI_BACKEND}.sh"
if [ -x ${install_script} ]; then
echo "Running ${install_script}"
${install_script}
fi

View File

@@ -6,7 +6,7 @@
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
# Installation
/vagrant/scripts/ci/before_install_db2.sh
/vagrant/scripts/ci/install_db2.sh
# Post-installation
## Let's be gentle to DB2 and try to not to recreate existing databases
echo "db2: checking if ${SOCI_USER} database exists"