diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e6efcd1d926ff91e342d4ea82ca37c65b73dccf..f7537513878307dc43caa63089c4bfceb7db274b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -331,6 +331,7 @@ build-windows: - mkdir windows - cd windows # Setup env + - pip3 install -U pip - python -m pip install -r ..\requirements.txt - python -m pip install -U -r ..\requirements.txt # Run Pyinstaller @@ -404,6 +405,23 @@ windows-package-exe: - copy ..\packages\pamhyr.nsi pamhyr.nsi - .\make-windows-exe.bat +build-check-clamav: + stage: antivirus + tags: + - release + - linux + needs: + - job: build-linux + artifacts: true + - job: build-windows + artifacts: true + rules: + - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG + script: + - cd packages + - ./clamav-scan.sh builds + allow_failure: true + pkg-check-clamav: stage: antivirus tags: @@ -420,7 +438,7 @@ pkg-check-clamav: - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG script: - cd packages - - ./clamav-scan.sh + - ./clamav-scan.sh packages allow_failure: true ########### diff --git a/packages/clamav-scan.sh b/packages/clamav-scan.sh index ddb134d13ab7cca06529d8e50f1780336cdc9a85..cb7fe693155801926bb353133cfdb25cf8d4cae7 100755 --- a/packages/clamav-scan.sh +++ b/packages/clamav-scan.sh @@ -1,8 +1,13 @@ #! /bin/bash set +x -OPTS="-r -a" -FILES="../windows/pamhyr-windows.exe ../windows/pamhyr-windows.zip ../linux/pamhyr-gnulinux.tar.xz" +OPTS="-r -a -i" + +if [ "$1" == "builds" ]; then + FILES="../windows/ ../linux/" +else + FILES="../windows/pamhyr-windows.exe ../windows/pamhyr-windows.zip ../linux/pamhyr-gnulinux.tar.xz" +fi clamscan $OPTS $FILES | tee clamav.log