Skip to content

Commit 196cd22

Browse files
committed
WIP
1 parent 305fab6 commit 196cd22

File tree

1 file changed

+6
-43
lines changed

1 file changed

+6
-43
lines changed

.github/actions/setup-botan/action.yml

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ inputs:
1111
botan-version:
1212
required: true
1313
description: "Botan version"
14-
run-tests:
15-
required: false
16-
description: "Run Botan tests before installing"
1714
runs:
1815
using: composite
1916
steps:
@@ -24,6 +21,8 @@ runs:
2421
path: ./tmp-botan
2522
ref: ${{ inputs.botan-version }}
2623

24+
### Cache ###
25+
2726
# The use of ccache/sccache drastically improves build times. The running time
2827
# of the setup-botan action went from 10-20 minutes to ~1-2 minute at the time
2928
# of writing this comment.
@@ -40,8 +39,7 @@ runs:
4039
### Build ###
4140
#
4241
# We only build the static and dynamic libraries and the executable, but not
43-
# the documentation. If tests are configured to run by setting
44-
# 'inputs.run-tests', then the tests are built as well.
42+
# the documentation or the tests.
4543

4644
- name: "🛠️ [Unix]: Build Botan"
4745
if: ${{ runner.os == 'Linux' || runner.os == 'MacOS' }}
@@ -50,7 +48,7 @@ runs:
5048
run: |
5149
python3 ./configure.py \
5250
--compiler-cache=ccache \
53-
--build-targets=static,shared,cli${{ inputs.run-tests == 'true' && ',tests' || '' }} \
51+
--build-targets=static,shared,cli \
5452
--without-documentation
5553
make
5654
@@ -66,50 +64,15 @@ runs:
6664
run: |
6765
python3 ./configure.py --cc=gcc --os=mingw \
6866
--compiler-cache=sccache \
69-
--build-targets=static,shared,cli${{ inputs.run-tests == 'true' && ',tests' || '' }} \
67+
--build-targets=static,shared,cli \
7068
--without-documentation \
7169
--prefix="C:\msys64\mingw64"
7270
make
7371
74-
### Run tests ###
75-
76-
- name: "🛠️ [Unix]: Run tests"
77-
if: ${{ inputs.run-tests == 'true' && (runner.os == 'Linux' || runner.os == 'MacOS') }}
78-
shell: sh
79-
working-directory: ./tmp-botan
80-
run: |
81-
make check
82-
83-
# TODO: on Windows, 'make check' will fail to start running the tests because
84-
# of wrong backwards/forward slashes in paths and calling the test executable
85-
# the wrong way. More precisely, 'make check' will run:
86-
#
87-
# > ./botan-test.exe --data-dir=.\src\tests/data
88-
#
89-
# Where it should be running:
90-
#
91-
# > ./botan-test --data-dir=./src/tests/data
92-
#
93-
# This might be because we are using bash where 'make check' is expecting a
94-
# different shell, maybe? See issue #39.
95-
- name: "🛠️ [Windows]: Run tests"
96-
if: ${{ inputs.run-tests == 'true' && runner.os == 'Windows' }}
97-
shell: C:/msys64/usr/bin/bash.exe -e '{0}'
98-
working-directory: ./tmp-botan
99-
run: |
100-
make check
101-
10272
### Install ###
10373
#
10474
# The install script can be run with debug logging enabled, but as far as we
105-
# can see you would have to run the script manually instead of via make. That
106-
# is, replace ...
107-
#
108-
# > make install
109-
#
110-
# ... by ...
111-
#
112-
# > python3 ./src/scripts/install.py --verbose --build-dir="build"
75+
# can see you would have to run the script manually instead of via make.
11376

11477
- name: "🛠️ [Unix]: Install Botan"
11578
if: ${{ runner.os == 'Linux' || runner.os == 'MacOS' }}

0 commit comments

Comments
 (0)