[openssl] OpenSSL_1_1_1-stable update
nic.tuv at gmail.com
nic.tuv at gmail.com
Thu Mar 4 19:04:41 UTC 2021
The branch OpenSSL_1_1_1-stable has been updated
via 01b9e18fb20ae158a056223fc62772887040d85f (commit)
via 732682aeb6cfddcf0a1844df52a254b104983276 (commit)
from a88ea7dfdfba2c34bd575076f12f06d80dd2c0c2 (commit)
- Log -----------------------------------------------------------------
commit 01b9e18fb20ae158a056223fc62772887040d85f
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Mar 2 13:42:39 2021 +0200
[1.1.1] Fix `make update` for out-of-tree builds
Fixes #11940
Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/14388)
commit 732682aeb6cfddcf0a1844df52a254b104983276
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date: Tue Mar 2 10:45:24 2021 +0200
[github-ci] Add a out-of-tree_build job
This adds a new job to trigger the bug reported in
<https://github.com/openssl/openssl/issues/11940>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14388)
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 21 +++++++++++++++++++++
Configurations/unix-Makefile.tmpl | 4 ++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aca73be1a0..5822e36ccb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,6 +70,27 @@ jobs:
- name: make test
run: make test
+ out-of-tree_build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout at v2
+ - name: setup build dir
+ run: |
+ set -eux
+ mkdir -p ${myblddir:=../_build/nest/a/little/more}
+ echo "mysrcdir=$(realpath .)" | tee -a $GITHUB_ENV
+ echo "myblddir=$(realpath $myblddir)" | tee -a $GITHUB_ENV
+ - name: config
+ run: set -eux ; cd ${{ env.myblddir }} && ${{ env.mysrcdir }}/config --strict-warnings && perl configdata.pm --dump
+ - name: make build_generated
+ run: set -eux; cd ${{ env.myblddir }} && make -s build_generated
+ - name: make update
+ run: set -eux; cd ${{ env.myblddir }} && make update
+ - name: make
+ run: set -eux; cd ${{ env.myblddir }} && make -s -j4
+ - name: make test (minimal subset)
+ run: set -eux; cd ${{ env.myblddir }} && make test TESTS='0[0-9]'
+
no-deprecated:
runs-on: ubuntu-latest
steps:
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 3a24d55135..41648c9526 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -917,8 +917,8 @@ errors:
done )
ordinals:
- ( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b util/mkdef.pl crypto update )
- ( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b util/mkdef.pl ssl update )
+ $(PERL) $(SRCDIR)/util/mkdef.pl crypto update
+ $(PERL) $(SRCDIR)/util/mkdef.pl ssl update
test_ordinals:
( cd test; \
More information about the openssl-commits
mailing list