github: Replace action for TKM tests with direct "docker run" call

The action causes errors because it is not compatible to the Docker
version used in the runner images.  Unfortunately, it doesn't seem
maintained anymore.  The action is simple enough, though, so instead of
switching to a fork, we just use "docker run" directly.
This commit is contained in:
Tobias Brunner
2026-02-20 12:37:37 +01:00
parent 2a8eb92767
commit 1afd5a7d23
+30 -29
View File
@@ -41,35 +41,36 @@ jobs:
- name: Build Docker Image - name: Build Docker Image
run: docker build -t strongswan-tkm -f testing/tkm/Dockerfile testing run: docker build -t strongswan-tkm -f testing/tkm/Dockerfile testing
- name: Run Tests in Container - name: Run Tests in Container
uses: addnab/docker-run-action@v3 run: |
with: docker run \
image: strongswan-tkm --cap-add net_admin \
shell: bash -v ${{ github.workspace }}:/strongswan \
options: | -v ${{ env.CCACHE_DIR }}:${{ env.CCACHE_CONTAINER }} \
--cap-add net_admin -e CCACHE_DIR=${{ env.CCACHE_CONTAINER }} \
-v ${{ github.workspace }}:/strongswan -e CCACHE_COMPILERCHECK \
-v ${{ env.CCACHE_DIR }}:${{ env.CCACHE_CONTAINER }} -e CCACHE_COMPRESS \
-e CCACHE_DIR=${{ env.CCACHE_CONTAINER }} -e CCACHE_MAXSIZE \
-e CCACHE_COMPILERCHECK strongswan-tkm \
-e CCACHE_COMPRESS bash -c "ccache -z; \
-e CCACHE_MAXSIZE echo '### build charon-tkm'; \
run: | autoreconf -i /strongswan || exit 1; \
ccache -z CFLAGS=\"-g -O2 -Wall -Wno-format -Wno-format-security -Wno-pointer-sign -Werror\" \
autoreconf -i /strongswan || exit 1
CFLAGS="-g -O2 -Wall -Wno-format -Wno-format-security -Wno-pointer-sign -Werror" \
/strongswan/configure --disable-defaults --enable-silent-rules \ /strongswan/configure --disable-defaults --enable-silent-rules \
--enable-ikev2 --enable-kernel-netlink --enable-pem --enable-pkcs1 \ --enable-ikev2 --enable-kernel-netlink --enable-pem --enable-pkcs1 \
--enable-random --enable-sha1 --enable-socket-default --enable-swanctl \ --enable-random --enable-sha1 --enable-socket-default --enable-swanctl \
--enable-tkm --enable-x509 || exit 1 --enable-tkm --enable-x509 || exit 1; \
# run tests without TKM first make -j || exit 1; \
make -j check TESTS_RUNNERS=tkm || exit 1 \
echo '### run tests without TKM first'; \
# generate TKM config make -j check TESTS_RUNNERS=tkm || exit 1; \
/usr/local/share/tkm/generate-config.sh \
echo '### generate TKM config'; \
# start TKM in the background /usr/local/share/tkm/generate-config.sh; \
tkm_keymanager -c tkm.conf -k key.der -r ca.der:1 >/tmp/tkm.log & echo '### start TKM in the background'; \
# run the tests against TKM and get TKM log tkm_keymanager -c tkm.conf -k key.der -r ca.der:1 >/tmp/tkm.log & \
make -j check TESTS_RUNNERS=tkm TESTS_TKM=1 || exit 1 \
cat /tmp/tkm.log echo '### run the tests against TKM and get TKM log'; \
ccache -s make -j check TESTS_RUNNERS=tkm TESTS_TKM=1 || exit 1; \
cat /tmp/tkm.log; \
ccache -s; \
"