Skip to content

Commit

Permalink
Fix linter errors that don't cause rebuilds (alisw#4776)
Browse files Browse the repository at this point in the history
* Fix whitespace issues in YAML headers
* Fix type of force_rebuild key
* Fix shebangs of force_rebuild packages
* Fix key order in YAML header
* Fix name of template recipe
  • Loading branch information
TimoWilken authored Jan 27, 2023
1 parent a63544b commit 4f58311
Show file tree
Hide file tree
Showing 31 changed files with 83 additions and 92 deletions.
2 changes: 1 addition & 1 deletion abseil.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: abseil
version: "%(tag_basename)s"
tag: "20220623.1"
tag: "20220623.1"
requires:
- "GCC-Toolchain:(?!osx)"
build_requires:
Expand Down
2 changes: 1 addition & 1 deletion aliroot-coverage.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: AliRoot-coverage
version: "%(year)s%(month)s%(day)s"
force_rebuild: 1
force_rebuild: true
requires:
- lcov
- AliRoot-test
Expand Down
4 changes: 2 additions & 2 deletions aliroot-csa.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package: AliRoot-csa
version: "%(short_hash)s"
tag: master
requires:
- ROOT
- SAS
env:
ALICE_ROOT: "$ALIROOT_ROOT"
source: http://git.cern.ch/pub/AliRoot
write_repo: https://git.cern.ch/reps/AliRoot
tag: master
write_repo: https://git.cern.ch/reps/AliRoot
---
#!/bin/sh
cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
Expand Down
2 changes: 1 addition & 1 deletion aliroot-guntest.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: AliRoot-guntest
version: v1
force_rebuild: 1
force_rebuild: true
requires:
- AliRoot
- AliRoot-OCDB
Expand Down
4 changes: 2 additions & 2 deletions aliroot-test.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package: AliRoot-test
version: "%(year)s%(month)s%(day)s"
force_rebuild: 1
force_rebuild: true
requires:
- AliPhysics
- GEANT3
- OCDB-test
- "IgProf:slc7.*"
---
#!/bin/sh
#!/bin/bash -e
export ALICE_ROOT=$ALIROOT_ROOT
echo "`date +%s`:aliroot-test: $x STARTED"
WORKSPACE=${WORKSPACE:-$BUILDDIR}
Expand Down
3 changes: 1 addition & 2 deletions alo-aliroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ build_requires:
- flatbuffers
- ms_gsl
source: https://github.com/mrrtf/alo
common_recipe: |
incremental_recipe: |
cmake --build . -- ${JOBS+-j $JOBS} install
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
# install the compilation database so that we can post-check the code
cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}

DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
# This really means we are in development mode. We need to make sure we
# use the real path for sources in this case. We also copy the
Expand Down
2 changes: 1 addition & 1 deletion alo-o2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ incremental_recipe: |
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
# install the compilation database so that we can post-check the code
cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}

DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
# This really means we are in development mode. We need to make sure we
# use the real path for sources in this case. We also copy the
Expand Down
4 changes: 2 additions & 2 deletions autotools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ prefer_system_check: |
prepend_path:
PKG_CONFIG_PATH: $(pkg-config --debug 2>&1 | grep 'Scanning directory' | sed -e "s/.*'\(.*\)'/\1/" | xargs echo | sed -e 's/ /:/g')
build_requires:
- termcap
- make
- termcap
- make
---
#!/bin/bash -e

Expand Down
2 changes: 1 addition & 1 deletion configuration.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: Configuration
version: "%(tag_basename)s"
tag: v2.6.3
tag: v2.6.3
requires:
- boost
- "GCC-Toolchain:(?!osx)"
Expand Down
19 changes: 9 additions & 10 deletions defaults-generators.sh
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
package: defaults-generators
version: v1
disable:
- arrow
- arrow
env:
CFLAGS: -fPIC -g -O2
CMAKE_BUILD_TYPE: RELWITHDEBINFO
CXXFLAGS: -fPIC -g -O2 -std=c++14
overrides:
GCC-Toolchain:
tag: v10.2.0-alice2
version: v10.2.0-alice2
tag: v10.2.0-alice2
boost:
requires:
- GCC-Toolchain:(?!osx)
- GCC-Toolchain:(?!osx)
fastjet:
tag: v3.4.0_1.045-alice1
version: v3.4.0_1.045-alice1
tag: v3.4.0_1.045-alice1
pythia:
requires:
- lhapdf
- boost
tag: v8304
package: defaults-generators
version: v1

requires:
- lhapdf
- boost
---
31 changes: 15 additions & 16 deletions defaults-o2-epn.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package: defaults-o2-epn
version: v1
env:
CFLAGS: -fPIC -O3 -march=znver2
CMAKE_BUILD_TYPE: RELWITHDEBINFO
Expand All @@ -15,31 +17,28 @@ overrides:
AliPhysics:
version: '%(commit_hash)s_O2'
AliRoot:
requires:
- ROOT
- DPMJET
- fastjet:(?!.*ppc64)
- GEANT3
- GEANT4_VMC
- Vc
- ZeroMQ
- JAliEn-ROOT
version: '%(commit_hash)s_O2'
requires:
- ROOT
- DPMJET
- fastjet:(?!.*ppc64)
- GEANT3
- GEANT4_VMC
- Vc
- ZeroMQ
- JAliEn-ROOT
GCC-Toolchain:
tag: v10.2.0-alice2
version: v10.2.0-alice2
tag: v10.2.0-alice2
cgal:
version: 4.12.2
fastjet:
tag: v3.4.0_1.045-alice1
pythia:
requires:
- lhapdf
- boost
tag: v8304
package: defaults-o2
version: v1

requires:
- lhapdf
- boost
---
# This file is included in any build recipe and it's only used to set
# environment variables. Which file to actually include can be defined by the
Expand Down
31 changes: 15 additions & 16 deletions defaults-o2.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package: defaults-o2
version: v1
env:
CFLAGS: -fPIC -O2
CMAKE_BUILD_TYPE: RELWITHDEBINFO
Expand All @@ -13,31 +15,28 @@ overrides:
AliPhysics:
version: '%(commit_hash)s_O2'
AliRoot:
requires:
- ROOT
- DPMJET
- fastjet:(?!.*ppc64)
- GEANT3
- GEANT4_VMC
- Vc
- ZeroMQ
- JAliEn-ROOT
version: '%(commit_hash)s_O2'
requires:
- ROOT
- DPMJET
- fastjet:(?!.*ppc64)
- GEANT3
- GEANT4_VMC
- Vc
- ZeroMQ
- JAliEn-ROOT
GCC-Toolchain:
tag: v10.2.0-alice2
version: v10.2.0-alice2
tag: v10.2.0-alice2
cgal:
version: 4.12.2
fastjet:
tag: v3.4.0_1.045-alice1
pythia:
requires:
- lhapdf
- boost
tag: v8304
package: defaults-o2
version: v1

requires:
- lhapdf
- boost
---
# This file is included in any build recipe and it's only used to set
# environment variables. Which file to actually include can be defined by the
Expand Down
1 change: 0 additions & 1 deletion defaults-prod-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ overrides:
boost:
requires:
- "GCC-Toolchain:(?!osx)"

---
1 change: 0 additions & 1 deletion defaults-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ overrides:
boost:
requires:
- "GCC-Toolchain:(?!osx)"

---
4 changes: 2 additions & 2 deletions epos-test.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package: EPOS-test
version: v1
force_rebuild: 1
force_rebuild: true
requires:
- EPOS
---
#!/bin/bash -ex
#!/bin/bash -e
export OPT=$PWD
export CHK=$PWD
cp "$EPO"/test/bp5nohnoc10n10f.optns .
Expand Down
4 changes: 2 additions & 2 deletions evtgen.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: EVTGEN
version: "%(tag_basename)s"
tag: "R02-02-00"
source: https://github.com/alisw/EVTGEN
source: https://github.com/alisw/EVTGEN
requires:
- HepMC
- pythia
Expand All @@ -11,7 +11,7 @@ build_requires:
- alibuild-recipe-tools
- "GCC-Toolchain:(?!osx)"
env:
EVTGENDATA: "$EVTGEN_ROOT/share"
EVTGENDATA: "$EVTGEN_ROOT/share"
---
#!/bin/bash -e
rsync -a --delete --exclude '**/.git' $SOURCEDIR/ ./
Expand Down
18 changes: 9 additions & 9 deletions fairmq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ version: "%(tag_basename)s"
tag: v1.4.56
source: https://github.com/FairRootGroup/FairMQ
requires:
- boost
- FairLogger
- ZeroMQ
- asiofi
- asio
- boost
- FairLogger
- ZeroMQ
- asiofi
- asio
build_requires:
- flatbuffers
- CMake
- "GCC-Toolchain:(?!osx)"
- FairCMakeModules
- flatbuffers
- CMake
- "GCC-Toolchain:(?!osx)"
- FairCMakeModules
incremental_recipe: |
cmake --build . --target install ${JOBS:+-- -j$JOBS}
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
Expand Down
4 changes: 2 additions & 2 deletions geant-vmc-test.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package: GEANT-VMC-test
version: "%(year)s%(month)s%(day)s"
force_rebuild: 1
force_rebuild: true
requires:
- GEANT4_VMC
- geant3_vmc-examples
---
#!/bin/sh
#!/bin/bash -e

g3vmc_testE01
g3vmc_testE02
Expand Down
5 changes: 2 additions & 3 deletions geant4.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: GEANT4
version: "%(tag_basename)s"
tag: "v11.0.3"
#source: https://github.com/alisw/geant4.git
# source: https://github.com/alisw/geant4.git
source: https://gitlab.cern.ch/geant4/geant4.git
requires:
- "GCC-Toolchain:(?!osx)"
Expand All @@ -14,8 +14,7 @@ incremental_recipe: |
make ${JOBS:+-j$JOBS} install
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
env:
G4INSTALL : $GEANT4_ROOT

G4INSTALL: $GEANT4_ROOT
---
# If this variable is not defined default it to OFF
: ${GEANT4_BUILD_MULTITHREADED:=OFF}
Expand Down
2 changes: 1 addition & 1 deletion grpc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: grpc
version: "%(tag_basename)s"
tag: v1.50.1
tag: v1.50.1
requires:
- protobuf
- c-ares
Expand Down
1 change: 0 additions & 1 deletion hijing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ requires:
- GCC-Toolchain:(?!osx)
build_requires:
- CMake

---
#!/bin/sh
cmake ${SOURCEDIR} \
Expand Down
4 changes: 2 additions & 2 deletions igprof-packaging.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package: IgProf-packaging
version: master
source: https://github.com/alisw/ali-bot
force_rebuild: 1
force_rebuild: true
requires:
- IgProf
---
#!/bin/sh
#!/bin/bash -e
mkdir -p igprof/usr libunwind/usr libatomic_ops/usr
tar xzf /sw/TARS/$ARCHITECTURE/IgProf/IgProf-$IGPROF_VERSION-$IGPROF_REVISION.$ARCHITECTURE.tar.gz --strip-components=4 -C igprof/usr
tar xzf /sw/TARS/$ARCHITECTURE/libunwind/libunwind-$LIBUNWIND_VERSION-$LIBUNWIND_REVISION.$ARCHITECTURE.tar.gz --strip-components=4 -C libunwind/usr
Expand Down
1 change: 0 additions & 1 deletion kernel-devel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ system_requirement_missing: |
* Ubuntu-compatible systems: Please install linux-headers-`uname -r` , libpci-dev, and libkmod-dev
system_requirement: ".*"
system_requirement_check: "find /usr/src -name kernel.h | grep include/linux/kernel.h > /dev/null 2>&1 && ls /usr/include/libkmod.h > /dev/null 2>&1 && find /usr/include -name pci.h | grep pci/pci.h > /dev/null 2>&1"

---
4 changes: 2 additions & 2 deletions looptools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ version: "%(tag_basename)s"
tag: v2.16-alice1
source: https://github.com/alisw/LoopTools
requires:
- "GCC-Toolchain:(?!osx)"
- "GCC-Toolchain:(?!osx)"
build_requires:
- alibuild-recipe-tools
- alibuild-recipe-tools
---
#!/bin/bash -e
rsync -a $SOURCEDIR/ ./
Expand Down
2 changes: 1 addition & 1 deletion o2-full-system-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ requires:
- O2sim
- O2Physics
- jq
force_rebuild: 1
force_rebuild: true
---
#!/bin/bash -e

Expand Down
Loading

0 comments on commit 4f58311

Please sign in to comment.