From 28efd79e8d2d62bb9431849d0597f9b4ca02e65e Mon Sep 17 00:00:00 2001 From: Scott J Dickerson Date: Jan 04 2022 17:32:57 +0000 Subject: better step names and build.sh comments --- diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 22fa80e..07391fa 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,14 +23,14 @@ jobs: dnf -y copr enable ovirt/ovirt-master-snapshot centos-stream-8 dnf -y module enable nodejs:14 - - name: Install build.sh required packages + - name: Install the base build.sh required packages run: | dnf -y install git make autoconf automake rpm-build - name: Checkout sources uses: actions/checkout@v2 - - name: Run automation/build.sh + - name: Run automation/build.sh (installs build dependencies as necessary) run: ./automation/build.sh - name: Upload artifacts @@ -58,7 +58,7 @@ jobs: dnf -y config-manager --add-repo https://dl.yarnpkg.com/rpm/yarn.repo dnf -y module enable nodejs:14 - - name: Install build.sh required packages + - name: Install the base build.sh required packages run: | dnf -y install git make autoconf automake rpm-build diff --git a/automation/build.sh b/automation/build.sh index 90f8788..0ac921f 100755 --- a/automation/build.sh +++ b/automation/build.sh @@ -4,10 +4,16 @@ [[ ${OFFLINE_BUILD:-1} -eq 1 ]] && use_nodejs_modules=1 || use_nodejs_modules=0 [[ ${MOVE_ARTIFACTS:-1} -eq 1 ]] && use_exported_artifacts=1 || use_exported_artifacts=0 +# During a full, offline build, install build dependencies if [[ $source_build -eq 0 && $use_nodejs_modules -eq 1 ]] ; then - # Force updating nodejs-modules so any pre-seed update to rpm wait is minimized + # To ensure the most currently available nodejs-modules is installed, clean the ovirt + # repo metadata so repo data cached on the build host doesn't cause problems (this is + # useful mostly for STD-CI) + # Note: When the project drops STD-CI (automation.yaml) support, the `clean metadata` + # commands may be removed. REPOS=$(dnf repolist | grep ovirt | cut -f 1 -d ' ' | paste -s -d,) dnf --disablerepo='*' --enablerepo="${REPOS}" clean metadata + dnf -y install ovirt-engine-nodejs-modules fi