Skip to content

Commit 21fed4e

Browse files
committed
Fix(build): Set testing OFF, use standard CMake pipelines, and clean up dev package
- Set BUILD_TESTING=OFF as want_check was causing errors - Use Melange standard cmake pipelines for configure, build, and install - Remove manual handling of aws-checksums dev folder as it is now handled upstream (see: awslabs/aws-checksums#101) Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
1 parent 05ad2fe commit 21fed4e

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

aws-checksums.yaml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,25 @@ pipeline:
2323
repository: https://github.com/awslabs/aws-checksums
2424
tag: v${{package.version}}
2525

26-
- runs: |
27-
if [ "$CBUILD" != "$CHOST" ]; then
28-
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
29-
fi
30-
CFLAGS="$CFLAGS -flto=auto" \
31-
CXXFLAGS="$CXXFLAGS -flto=auto" \
32-
cmake -B build -G Ninja \
33-
-DCMAKE_INSTALL_PREFIX=/usr \
34-
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
26+
- uses: cmake/configure
27+
with:
28+
opts: |
3529
-DBUILD_SHARED_LIBS=True \
3630
-DCMAKE_BUILD_TYPE=None \
37-
-DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \
38-
$CMAKE_CROSSOPTS
39-
cmake --build build
31+
-DBUILD_TESTING=OFF \
32+
-DCMAKE_SYSTEM_NAME=Linux \
33+
-DCMAKE_HOST_SYSTEM_NAME=Linux
34+
35+
- uses: cmake/build
4036

41-
- runs: |
42-
DESTDIR="${{targets.destdir}}" cmake --install build
37+
- uses: cmake/install
4338

4439
- uses: strip
4540

4641
subpackages:
4742
- name: aws-checksums-dev
4843
pipeline:
4944
- uses: split/dev
50-
- runs: |
51-
mkdir -p "${{targets.subpkgdir}}"/usr/lib
52-
mv "${{targets.destdir}}"/usr/lib/aws-checksums "${{targets.subpkgdir}}"/usr/lib/
5345
dependencies:
5446
runtime:
5547
- aws-checksums

0 commit comments

Comments
 (0)