Skip to content

Conversation

@hannahilea
Copy link
Contributor

As required by OPENDAP/bes#1183 for the ubuntu build.

@hannahilea hannahilea marked this pull request as ready for review December 1, 2025 15:48
# There is no dist - we pull this from github using a tag

aws_s2n_tls=aws_s2n_tls
aws_s2n_tls_tag=v1.6.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

current latest version

.PHONY: aws_cdk
aws_cdk: aws_cdk-install-stamp

# AWS s2n-tls (conditionally required by AWS SDK)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Targets here were adapted from the matching aws_cdk targets, based on the s2n-tls build instructions.

# We might want to use for development cmake --build . --config=Debug
aws_s2n_tls-compile-stamp: aws_s2n_tls-configure-stamp
(cd $(aws_s2n_tls_src)/build && cmake --build . --config=Debug --parallel \
&& ctest --test-dir . --parallel)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know if we should be running these tests here (looks like we don't elsewhere?) but it seems useful to prove to ourselves that they pass? I can take this out if desired.

- tar -C $HOME/rocky8/ -czvf $TRAVIS_BUILD_DIR/package/hyrax-dependencies-rocky8-static.tar.gz install
- num_deps_installed=$(find . -name '*-install-stamp' | wc -l)
- if [ "$num_deps_installed" != 10 ]; then echo "Unexpected number of dependencies installed; found $num_deps_installed."; exit 1; fi
- if [ "$num_deps_installed" != 12 ]; then echo "Unexpected number of dependencies installed; found $num_deps_installed."; exit 1; fi
Copy link
Contributor Author

Choose a reason for hiding this comment

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

...it seems weird that this build is finding two extra stamp files instead of just one, but since the goal is to keep track of whether this number falls, 🤷 .

Copy link
Contributor

Choose a reason for hiding this comment

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

On my branch each os target is getting 12 reps installed.

Also there is a specific make target to see what was installed;

make list-built

😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On my branch each os target is getting 12 reps installed

That's so weird, I wonder why I was only seeing 11 back when I added this test to begin with? 🤷

I intentionally didn't use make list-build for SOME reason, I think because it was easier to count lines of found files, but it wasn't a strong preference...I just wanted SOME test on there ASAP. So happy to change any of this in a follow-up PR.

Copy link
Contributor

@ndp-opendap ndp-opendap left a comment

Choose a reason for hiding this comment

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

I think we might want to think about using

make list-built

to detect the things..
James had some thoughts on this...

- tar -C $HOME/rocky8/ -czvf $TRAVIS_BUILD_DIR/package/hyrax-dependencies-rocky8-static.tar.gz install
- num_deps_installed=$(find . -name '*-install-stamp' | wc -l)
- if [ "$num_deps_installed" != 10 ]; then echo "Unexpected number of dependencies installed; found $num_deps_installed."; exit 1; fi
- if [ "$num_deps_installed" != 12 ]; then echo "Unexpected number of dependencies installed; found $num_deps_installed."; exit 1; fi
Copy link
Contributor

Choose a reason for hiding this comment

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

On my branch each os target is getting 12 reps installed.

Also there is a specific make target to see what was installed;

make list-built

😄

@hannahilea hannahilea merged commit 0878a79 into master Dec 1, 2025
3 checks passed
@hannahilea hannahilea deleted the hr/add-aws-s2n-tls branch December 1, 2025 17:09
@hannahilea hannahilea mentioned this pull request Dec 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants