The branch master has been updated
via 817d408dd9a8d31866351e4676d232dce93ebbcf (commit)
via 349fd92429145a5821e96dabae1c82eab93caa80 (commit)
via 057fc59a894a5e52cee73f56aec8f14bb56efcfc (commit)
via 3113192705b27958609f525725f830d046f0ded7 (commit)
from 4f7fc52979ab3a5ff28defd0972b70bbae72a1f7 (commit)
- Log -----------------------------------------------------------------
commit 817d408dd9a8d31866351e4676d232dce93ebbcf
Author: Tomas Mraz <to...@openssl.org>
Date: Mon May 24 19:57:28 2021 +0200
Do not try to install image directories with no images
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15433)
commit 349fd92429145a5821e96dabae1c82eab93caa80
Author: Tomas Mraz <to...@openssl.org>
Date: Mon May 24 19:46:34 2021 +0200
FIPS checksums CI: use merge checkout to compute the new checksums
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15433)
commit 057fc59a894a5e52cee73f56aec8f14bb56efcfc
Author: Tomas Mraz <to...@openssl.org>
Date: Mon May 24 15:47:26 2021 +0200
Windows CI: properly drop test_fuzz* tests to speed up things
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15433)
commit 3113192705b27958609f525725f830d046f0ded7
Author: Tomas Mraz <to...@openssl.org>
Date: Mon May 24 12:16:00 2021 +0200
Windows CI: Add make install step on the shared 64 bit build
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15433)
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/fips-checksums.yml | 1 -
.github/workflows/windows.yml | 13 ++++++++---
Configurations/unix-Makefile.tmpl | 42 ------------------------------------
Configurations/windows-makefile.tmpl | 9 --------
4 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/fips-checksums.yml
b/.github/workflows/fips-checksums.yml
index 17d8b4073d..12953a38fb 100644
--- a/.github/workflows/fips-checksums.yml
+++ b/.github/workflows/fips-checksums.yml
@@ -28,7 +28,6 @@ jobs:
working-directory: ./build-pristine
- uses: actions/checkout@v2
with:
- ref: ${{ github.event.pull_request.head.sha }}
clean: false
- name: config
run: ../config enable-fips && perl configdata.pm --dump
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 56489408b5..0d0b594808 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -32,7 +32,14 @@ jobs:
run: nmake
- name: test
working-directory: _build
- run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
+ run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+ - name: install
+ # Run on 64 bit only as 32 bit is slow enough already
+ if: $${{ matrix.arch == 'win64' }}
+ run: |
+ mkdir _dest
+ nmake install DESTDIR=_dest
+ working-directory: _build
plain:
runs-on: windows-latest
steps:
@@ -50,7 +57,7 @@ jobs:
run: nmake
- name: test
working-directory: _build
- run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
+ run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
minimal:
runs-on: windows-latest
steps:
@@ -68,4 +75,4 @@ jobs:
run: nmake
- name: test
working-directory: _build
- run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
+ run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index c428b5f85a..5a5d44ce15 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1078,31 +1078,7 @@ uninstall_html_docs: uninstall_image_docs
done
install_image_docs:
- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1/img
- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3/img
- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5/img
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7/img
- @set -e; for x in dummy $(IMAGEDOCS1); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \
- cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \
- chmod 644 $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \
- done
- @set -e; for x in dummy $(IMAGEDOCS3); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \
- cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \
- chmod 644 $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \
- done
- @set -e; for x in dummy $(IMAGEDOCS5); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \
- cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \
- chmod 644 $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \
- done
@set -e; for x in dummy $(IMAGEDOCS7); do \
if [ "$$x" = "dummy" ]; then continue; fi; \
fn=`basename $$x`; \
@@ -1112,24 +1088,6 @@ install_image_docs:
done
uninstall_image_docs:
- @set -e; for x in dummy $(IMAGEDOCS1); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \
- $(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \
- done
- @set -e; for x in dummy $(IMAGEDOCS3); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \
- $(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \
- done
- @set -e; for x in dummy $(IMAGEDOCS5); do \
- if [ "$$x" = "dummy" ]; then continue; fi; \
- fn=`basename $$x`; \
- $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \
- $(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \
- done
@set -e; for x in dummy $(IMAGEDOCS7); do \
if [ "$$x" = "dummy" ]; then continue; fi; \
fn=`basename $$x`; \
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index 632e5ce4b5..b36592d383 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -624,16 +624,7 @@ uninstall_html_docs: uninstall_image_docs
install_image_docs:
@if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@echo *** Installing HTML images
- @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man1\img"
- @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man3\img"
- @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man5\img"
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man7\img"
- @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man1\img\*.png \
- "$(INSTALLTOP)\html\man1\img"
- @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man3\img\*.png \
- "$(INSTALLTOP)\html\man3\img"
- @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man5\img\*.png \
- "$(INSTALLTOP)\html\man5\img"
@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man7\img\*.png \
"$(INSTALLTOP)\html\man7\img"
