Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup codecov artifacts #3425

Merged
merged 1 commit into from
Aug 3, 2022
Merged

cleanup codecov artifacts #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,7 @@ benchmark: bin
$(MAKE) -C tests benchmark

.PHONY : coverage
coverage: run-gcov run-lcov run-genhtml

.PHONY : run-gcov
run-gcov:
$(MAKE) -C bin gcov
$(MAKE) -C crypto gcov
$(MAKE) -C error gcov
$(MAKE) -C pq-crypto run-gcov
$(MAKE) -C stuffer gcov
$(MAKE) -C tests gcov
$(MAKE) -C tls run-gcov
$(MAKE) -C utils gcov
coverage: run-lcov run-genhtml

.PHONY : run-lcov
run-lcov:
Expand Down
2 changes: 0 additions & 2 deletions codebuild/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ General flow of the CodeBuild Test Projects
- codebuild/run_ctverif.sh
- codebuild/run_sidetrail.sh
- codebuild/grep_simple_mistakes.sh
- codebuild/s2n_after_codebuild.sh
- curl -s https://codecov.io/bash


### Usage to setup Projects
Expand Down
31 changes: 0 additions & 31 deletions codebuild/bin/s2n_after_codebuild.sh
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions codebuild/bin/s2n_codebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,3 @@ if [[ "$TESTS" == "sawHMAC" ]] && [[ "$OS_NAME" == "linux" ]]; then make -C test
if [[ "$TESTS" == "sawDRBG" ]]; then make -C tests/saw tmp/verify_drbg.log ; fi
if [[ "$TESTS" == "ALL" || "$TESTS" == "tls" ]]; then make -C tests/saw tmp/verify_handshake.log ; fi
if [[ "$TESTS" == "sawHMACFailure" ]]; then make -C tests/saw failure-tests ; fi

# Generate *.gcov files that can be picked up by the CodeCov.io Bash helper script. Don't run lcov or genhtml
# since those will delete .gcov files as they're processed.
if [[ "$CODECOV_IO_UPLOAD" == "true" && "$FUZZ_COVERAGE" != "true" ]]; then
make run-gcov;
fi
6 changes: 3 additions & 3 deletions codebuild/codebuild.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stack_name: s2nCodeBuildTests
# Fuzzers
[CodeBuild:s2nfuzzerOpenSSL111Coverage]
snippet: UbuntuFuzzJob
env: S2N_LIBCRYPTO=openssl-1.1.1 LATEST_CLANG=true TESTS=fuzz FUZZ_TIMEOUT_SEC=60 FUZZ_COVERAGE=true CODECOV_IO_UPLOAD=true
env: S2N_LIBCRYPTO=openssl-1.1.1 LATEST_CLANG=true TESTS=fuzz FUZZ_TIMEOUT_SEC=60 FUZZ_COVERAGE=true

[CodeBuild:s2nfuzzerOpenSSL102FIPS]
snippet: UbuntuFuzzJob
Expand All @@ -28,7 +28,7 @@ env: S2N_LIBCRYPTO=libressl BUILD_S2N=true TESTS=integration GCC_VERSION=9

[CodeBuild:s2nIntegrationOpenSSL111Gcc6Coverage]
snippet: UbuntuBoilerplate2XL
env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true
env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true

[CodeBuild:s2nIntegrationOpenSSL111Gcc6Corked]
snippet: UbuntuBoilerplate2XL
Expand All @@ -53,7 +53,7 @@ env: S2N_LIBCRYPTO=boringssl BUILD_S2N=true TESTS=integration GCC_VERSION=9
# Asan Test
[CodeBuild:s2nAsanOpenSSL111Gcc6Coverage]
snippet: UbuntuBoilerplateLarge
env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=asan GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true
env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=asan GCC_VERSION=6 S2N_COVERAGE=true

#Valgrind Test
[CodeBuild:s2nValgrindOpenSSL111Gcc9]
Expand Down
10 changes: 3 additions & 7 deletions codebuild/spec/buildspec_omnibus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ batch:
S2N_LIBCRYPTO: 'openssl-1.1.1'
BUILD_S2N: 'true'
S2N_COVERAGE: 'true'
CODECOV_IO_UPLOAD: 'true'
CODECOV_TOKEN: 'e460b7c1-6019-4a50-b65d-555c4a8fbc22'

- identifier: s2nAsanOpenssl102
buildspec: codebuild/spec/buildspec_ubuntu.yml
Expand Down Expand Up @@ -187,20 +185,19 @@ batch:
variables:
GCC_VERSION: '6'
TESTS: crt

- buildspec: codebuild/spec/buildspec_ubuntu.yml
env:
compute-type: BUILD_GENERAL1_LARGE
privileged-mode: true
variables:
BUILD_S2N: true
CODECOV_IO_UPLOAD: true
GCC_VERSION: 6
S2N_COVERAGE: true
S2N_LIBCRYPTO: openssl-1.1.1
TESTS: unit
identifier: s2nUnitOpenSSL111Gcc6Coverage

- buildspec: codebuild/spec/buildspec_ubuntu.yml
env:
compute-type: BUILD_GENERAL1_SMALL
Expand All @@ -212,7 +209,7 @@ batch:
S2N_NO_PQ: 1
TESTS: unit
identifier: s2nUnitLibressl

- buildspec: codebuild/spec/buildspec_ubuntu.yml
env:
compute-type: BUILD_GENERAL1_SMALL
Expand All @@ -238,7 +235,6 @@ batch:
TESTS: fuzz
FUZZ_TIMEOUT_SEC: 60
FUZZ_COVERAGE: true
CODECOV_IO_UPLOAD: true

- identifier: s2nFuzzerOpenSSL102
buildspec: codebuild/spec/buildspec_ubuntu_fuzz_artifacts.yml
Expand Down
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_sidetrail.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,3 @@ phases:
post_build:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optionally for all of these with nothing else happening in post_build, we could just drop the whole phase.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes true. in the interest of not manually running the ci jobs again, i am inclined to address this in a follow up pr

commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,3 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_fuzz_artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
artifacts:
files:
- "./tests/fuzz/corpus/$FUZZ_TESTS/*"
Expand Down
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_integ_awslc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,3 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_integ_boringlibre.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_integ_openssl102.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_integ_openssl102_asanvalgrind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ phases:
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
4 changes: 1 addition & 3 deletions codebuild/spec/buildspec_ubuntu_integ_openssl111.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ phases:
commands:
- printenv
- S2N_LIBCRYPTO=openssl-1.1.1 GCC_VERSION=4.8 $CB_BIN_DIR/s2n_codebuild.sh
- S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true $CB_BIN_DIR/s2n_codebuild.sh
- S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true $CB_BIN_DIR/s2n_codebuild.sh
- S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_CORKED_IO=true $CB_BIN_DIR/s2n_codebuild.sh
post_build:
commands:
- echo Build completed on `date`
- echo Uploading CodeCov.io artifacts
- $CB_BIN_DIR/s2n_after_codebuild.sh
67 changes: 0 additions & 67 deletions codecov.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pq-crypto/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ all: $(OBJS)
$(MAKE) -C kyber_r3
endif

.PHONY : run-gcov
run-gcov: gcov
$(MAKE) -C kyber_r3 gcov

.PHONY : run-lcov
run-lcov: lcov
$(MAKE) -C kyber_r3 lcov
Expand Down
6 changes: 0 additions & 6 deletions s2n.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ endif
ifndef COV_TOOL
ifneq ("$(wildcard $(LLVM_GCOV_MARKER_FILE))","")
COV_TOOL=llvm-gcov.sh
else
COV_TOOL=gcov
endif
endif

Expand Down Expand Up @@ -261,10 +259,6 @@ INDENTOPTS = -npro -kr -i4 -ts4 -nut -sob -l180 -ss -ncs -cp1
indentsource:
( for source in ${SOURCES} ; do ${INDENT} ${INDENTOPTS} $$source; done )

.PHONY : gcov
gcov:
( for source in ${SOURCES} ; do $(COV_TOOL) $$source; done )

.PHONY : lcov
lcov:
lcov --capture --directory . --gcov-tool $(COV_TOOL) --output ./coverage.info
Expand Down
4 changes: 0 additions & 4 deletions tls/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ all: $(OBJS)
bc: $(BCS)
$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) bc)

.PHONY : run-gcov
run-gcov: gcov
$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) gcov)

.PHONY : run-lcov
run-lcov: lcov
$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) lcov)
Expand Down