From 28dd39d895d8e8c8d53a3d1cd277b3050642c4bf Mon Sep 17 00:00:00 2001 From: "Yevtushenko, Vitalii" Date: Wed, 18 Oct 2023 12:30:40 +0200 Subject: [PATCH 1/3] ci fix Signed-off-by: Yevtushenko, Vitalii --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e9d43cd3c..7a1af39138 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: Aktualizr CI on: push: - branches: [ master ] + branches: [ master, fix-ci ] pull_request: branches: [ master ] env: @@ -28,6 +28,8 @@ jobs: with: submodules: recursive - run: git fetch --prune --unshallow + - name: Git exeption + run: git config --global --add safe.directory /home/runner/work/aktualizr/aktualizr - name: Docker login if: github.token run: echo ${{ github.token }} | docker login docker.pkg.github.com -u advancedtelematic --password-stdin From a8ccc642ac2f4e31fea4382e7217912adfd37169 Mon Sep 17 00:00:00 2001 From: "Yevtushenko, Vitalii" Date: Wed, 18 Oct 2023 12:38:24 +0200 Subject: [PATCH 2/3] ci fix test.sh Signed-off-by: Yevtushenko, Vitalii --- scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 732a1370ba..775e75a377 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -32,7 +32,7 @@ TEST_TESTSUITE_EXCLUDE=${TEST_TESTSUITE_EXCLUDE:-} TEST_PKCS11_MODULE_PATH=${TEST_PKCS11_MODULE_PATH:-/usr/lib/softhsm/libsofthsm2.so} # note: on Ubuntu bionic, use /usr/lib/engines/engine_pkcs11.so on xenial TEST_PKCS11_ENGINE_PATH=${TEST_PKCS11_ENGINE_PATH:-/usr/lib/x86_64-linux-gnu/engines-1.1/libpkcs11.so} - +git config --global --add safe.directory /home/runner/work/aktualizr/aktualizr # Build CMake arguments CMAKE_ARGS=() CMAKE_ARGS+=("-G$TEST_CMAKE_GENERATOR") From c838d01714f437937267d2f6a3073812bf980273 Mon Sep 17 00:00:00 2001 From: "Yevtushenko, Vitalii" Date: Wed, 18 Oct 2023 14:42:40 +0200 Subject: [PATCH 3/3] ci fix Signed-off-by: Yevtushenko, Vitalii --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a1af39138..7e9d43cd3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: Aktualizr CI on: push: - branches: [ master, fix-ci ] + branches: [ master ] pull_request: branches: [ master ] env: @@ -28,8 +28,6 @@ jobs: with: submodules: recursive - run: git fetch --prune --unshallow - - name: Git exeption - run: git config --global --add safe.directory /home/runner/work/aktualizr/aktualizr - name: Docker login if: github.token run: echo ${{ github.token }} | docker login docker.pkg.github.com -u advancedtelematic --password-stdin