Skip to content

Commit 4498726

Browse files
committed
ci: cache the tpm2-tss install
Signed-off-by: Erik Larsson <[email protected]>
1 parent 6e14d6f commit 4498726

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.ci/install-deps.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,16 @@ if ! pkg-config tss2-sys; then
6666
extra_configure_flags="--disable-fapi"
6767
fi
6868
./bootstrap
69-
./configure --sysconfdir=/etc ${extra_configure_flags} CFLAGS=-g
70-
make -j4
71-
sudo make install
69+
./configure --prefix="${CI_DEPS_PATH}" ${extra_configure_flags} CFLAGS=-g
70+
make -j$(nproc)
71+
make install
7272
sudo ldconfig
7373
popd
7474
fi
7575

76+
# link ${CI_DEPS_PATH}/etc/tpm2-tss to /etc/ for the FAPI tests
77+
sudo ln -s "${CI_DEPS_PATH}/etc/tpm2-tss" /etc/
78+
7679
#
7780
# Get a simulator
7881
#

.ci/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ fi
77

88
# Setup environment for using cached libraries/binaries
99
export CI_DEPS_PATH="${HOME}/cideps"
10-
export PATH="${PATH}:${CI_DEPS_PATH}/bin"
11-
export PKG_CONFIG_PATH="${CI_DEPS_PATH}/lib/pkgconfig"
12-
export LD_LIBRARY_PATH="${CI_DEPS_PATH}/lib/"
10+
export PATH="${PATH:+${PATH}:}${CI_DEPS_PATH}/bin"
11+
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${CI_DEPS_PATH}/lib/pkgconfig"
12+
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${CI_DEPS_PATH}/lib/"
1313

1414
SRC_ROOT=${SRC_ROOT:-"${PWD}"}
1515
PYTHON=${PYTHON:-"python3"}

.github/workflows/tests.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ jobs:
5757
path: ~/cideps/bin/tpm2*
5858
key: tools-${{ matrix.tools-version }}-${{ matrix.tss-version }}
5959

60+
- name: cache tpm2-tss
61+
uses: actions/cache@v3
62+
if: matrix.tss-version != 'master'
63+
with:
64+
path: |
65+
~/cideps/lib/libtss2-*
66+
~/cideps/lib/pkgconfig/tss2-*
67+
~/cideps/include/tss2
68+
~/cideps/etc/tpm2-tss
69+
key: tss2-${{ matrix.tss-version }}-c1
70+
6071
- name: Install dependencies
6172
env:
6273
TPM2_TSS_VERSION: ${{ matrix.tss-version }}

0 commit comments

Comments
 (0)