Skip to content

Commit d2350c7

Browse files
committed
Update CI use
1 parent 1c87808 commit d2350c7

11 files changed

Lines changed: 24 additions & 17 deletions

File tree

.github/workflows/build-test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ jobs:
7272
with:
7373
create-symlink: true
7474
- name: Dependencies
75-
run: ./deps.sh
75+
run: ./build.sh deps
7676
- name: Prep
77-
run: ./prep.sh -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF -DBUILD_TESTING=ON
77+
run: ./build.sh prep -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF -DBUILD_TESTING=ON
7878
- name: Build
7979
run: ./build.sh
8080
- name: Test
@@ -113,9 +113,9 @@ jobs:
113113
with:
114114
create-symlink: true
115115
- name: Dependencies
116-
run: ./deps.sh
116+
run: ./build.sh deps
117117
- name: Prep
118-
run: ./prep.sh -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF -DBUILD_TESTING=ON
118+
run: ./build.sh prep -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF -DBUILD_TESTING=ON
119119
- name: Build
120120
run: ./build.sh
121121
- name: Install

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ jobs:
8787
sudo apt-get update && sudo apt-get install -y \
8888
cmake ninja-build ruby build-essential \
8989
libssl-dev
90-
./deps.sh
91-
./prep.sh -DTEST_MEMCHECK=OFF -DTEST_COVERAGE=OFF -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF
90+
./build.sh deps
91+
./build.sh prep -DTEST_MEMCHECK=OFF -DTEST_COVERAGE=OFF -DBUILD_DOCS_API=OFF -DBUILD_DOCS_MAN=OFF
9292
9393
# Initializes the CodeQL tools for scanning.
9494
- name: Initialize CodeQL

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
libssl-dev \
4848
doxygen graphviz plantuml texlive texlive-latex-extra dblatex
4949
- name: Dependency build
50-
run: ./deps.sh
50+
run: ./build.sh deps
5151
- name: Prep
52-
run: ./prep.sh -DBUILD_TESTING=OFF -DTEST_MEMCHECK=OFF -DTEST_COVERAGE=OFF -DBUILD_DOCS_API=ON
52+
run: ./build.sh prep -DBUILD_TESTING=OFF -DTEST_MEMCHECK=OFF -DTEST_COVERAGE=OFF -DBUILD_DOCS_API=ON
5353
- name: Build
5454
run: |
5555
./build.sh --target docs-api-html docs-api-pdf

.github/workflows/formatting.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,4 @@ jobs:
4848
clang-format python3-pip
4949
pip3 install licenseheaders
5050
- name: Check code formatting
51-
run: ./check_format.sh #|| echo "::warning ::Code formatting issues detected"
52-
continue-on-error: true
51+
run: ./build.sh check-format

.github/workflows/packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
sudo apt-get update && sudo apt-get install -y
4646
cmake ninja-build build-essential
4747
- name: Prep
48-
run: ./prep.sh -DBUILD_LIB=OFF -DBUILD_TESTING=OFF -DBUILD_DOCS=OFF -DBUILD_PACKAGE=ON
48+
run: ./build.sh prep -DBUILD_LIB=OFF -DBUILD_TESTING=OFF -DBUILD_DOCS=OFF -DBUILD_PACKAGE=ON
4949
- name: Build
5050
run: |
5151
./build.sh rpm-container

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[[
2-
Copyright (c) 2024 The Johns Hopkins University Applied Physics
2+
Copyright (c) 2025 The Johns Hopkins University Applied Physics
33
Laboratory LLC.
44
55
This file is part of the Bundle Protocol Security Library (BSL).

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2024 The Johns Hopkins University Applied Physics
2+
Copyright (c) 2025 The Johns Hopkins University Applied Physics
33
Laboratory LLC.
44
55
This file is part of the Bundle Protocol Security Library (BSL).

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2024 The Johns Hopkins University Applied Physics
2+
Copyright (c) 2025 The Johns Hopkins University Applied Physics
33
Laboratory LLC.
44
55
This file is part of the Bundle Protocol Security Library (BSL).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2024 The Johns Hopkins University Applied Physics
2+
Copyright (c) 2025 The Johns Hopkins University Applied Physics
33
Laboratory LLC.
44
55
This file is part of the Bundle Protocol Security Library (BSL).

build.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
##
3-
## Copyright (c) 2024 The Johns Hopkins University Applied Physics
3+
## Copyright (c) 2025 The Johns Hopkins University Applied Physics
44
## Laboratory LLC.
55
##
66
## This file is part of the Bundle Protocol Security Library (BSL).
@@ -34,6 +34,7 @@ BUILDDIR=${SELFDIR}/build/default
3434
function usage {
3535
echo "Usage: $0 [command] [args...]"
3636
echo "Commands:"
37+
echo " check-format - Apply and check format for all source code"
3738
echo " apply-format - Apply format to all source code"
3839
echo " apply-license - Apply/update license preamble to files"
3940
echo " check - Run unit tests"
@@ -48,6 +49,10 @@ function usage {
4849
echo " run [args...] - Run a command with the environment vars"
4950
}
5051

52+
function cmd_check_format {
53+
./resources/check_format.sh
54+
}
55+
5156
function cmd_apply_format {
5257
./resources/apply_format.sh
5358
}
@@ -150,6 +155,9 @@ case "$1" in
150155
shift
151156
echo "Test-after-shift: $@"
152157
;;
158+
check-format)
159+
cmd_check_format
160+
;;
153161
apply-format)
154162
cmd_apply_format
155163
;;

0 commit comments

Comments
 (0)