Skip to content

Commit 4f58311

Browse files
authored
Fix linter errors that don't cause rebuilds (#4776)
* 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
1 parent a63544b commit 4f58311

31 files changed

+83
-92
lines changed

abseil.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: abseil
22
version: "%(tag_basename)s"
3-
tag: "20220623.1"
3+
tag: "20220623.1"
44
requires:
55
- "GCC-Toolchain:(?!osx)"
66
build_requires:

aliroot-coverage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: AliRoot-coverage
22
version: "%(year)s%(month)s%(day)s"
3-
force_rebuild: 1
3+
force_rebuild: true
44
requires:
55
- lcov
66
- AliRoot-test

aliroot-csa.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package: AliRoot-csa
22
version: "%(short_hash)s"
3+
tag: master
34
requires:
45
- ROOT
56
- SAS
67
env:
78
ALICE_ROOT: "$ALIROOT_ROOT"
89
source: http://git.cern.ch/pub/AliRoot
9-
write_repo: https://git.cern.ch/reps/AliRoot
10-
tag: master
10+
write_repo: https://git.cern.ch/reps/AliRoot
1111
---
1212
#!/bin/sh
1313
cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \

aliroot-guntest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: AliRoot-guntest
22
version: v1
3-
force_rebuild: 1
3+
force_rebuild: true
44
requires:
55
- AliRoot
66
- AliRoot-OCDB

aliroot-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package: AliRoot-test
22
version: "%(year)s%(month)s%(day)s"
3-
force_rebuild: 1
3+
force_rebuild: true
44
requires:
55
- AliPhysics
66
- GEANT3
77
- OCDB-test
88
- "IgProf:slc7.*"
99
---
10-
#!/bin/sh
10+
#!/bin/bash -e
1111
export ALICE_ROOT=$ALIROOT_ROOT
1212
echo "`date +%s`:aliroot-test: $x STARTED"
1313
WORKSPACE=${WORKSPACE:-$BUILDDIR}

alo-aliroot.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ build_requires:
1212
- flatbuffers
1313
- ms_gsl
1414
source: https://github.com/mrrtf/alo
15-
common_recipe: |
1615
incremental_recipe: |
1716
cmake --build . -- ${JOBS+-j $JOBS} install
1817
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
1918
# install the compilation database so that we can post-check the code
2019
cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}
21-
20+
2221
DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
2322
# This really means we are in development mode. We need to make sure we
2423
# use the real path for sources in this case. We also copy the

alo-o2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ incremental_recipe: |
1515
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
1616
# install the compilation database so that we can post-check the code
1717
cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}
18-
18+
1919
DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
2020
# This really means we are in development mode. We need to make sure we
2121
# use the real path for sources in this case. We also copy the

autotools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ prefer_system_check: |
1010
prepend_path:
1111
PKG_CONFIG_PATH: $(pkg-config --debug 2>&1 | grep 'Scanning directory' | sed -e "s/.*'\(.*\)'/\1/" | xargs echo | sed -e 's/ /:/g')
1212
build_requires:
13-
- termcap
14-
- make
13+
- termcap
14+
- make
1515
---
1616
#!/bin/bash -e
1717

configuration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: Configuration
22
version: "%(tag_basename)s"
3-
tag: v2.6.3
3+
tag: v2.6.3
44
requires:
55
- boost
66
- "GCC-Toolchain:(?!osx)"

defaults-generators.sh

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1+
package: defaults-generators
2+
version: v1
13
disable:
2-
- arrow
4+
- arrow
35
env:
46
CFLAGS: -fPIC -g -O2
57
CMAKE_BUILD_TYPE: RELWITHDEBINFO
68
CXXFLAGS: -fPIC -g -O2 -std=c++14
79
overrides:
810
GCC-Toolchain:
9-
tag: v10.2.0-alice2
1011
version: v10.2.0-alice2
12+
tag: v10.2.0-alice2
1113
boost:
1214
requires:
13-
- GCC-Toolchain:(?!osx)
15+
- GCC-Toolchain:(?!osx)
1416
fastjet:
15-
tag: v3.4.0_1.045-alice1
1617
version: v3.4.0_1.045-alice1
18+
tag: v3.4.0_1.045-alice1
1719
pythia:
18-
requires:
19-
- lhapdf
20-
- boost
2120
tag: v8304
22-
package: defaults-generators
23-
version: v1
24-
21+
requires:
22+
- lhapdf
23+
- boost
2524
---

0 commit comments

Comments
 (0)