From 08a7f3b4ce0e2ba4c6d078cf3f3358d45a2a249e Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 28 Sep 2021 10:15:09 +0200 Subject: [PATCH] Fix ci --- .gitlab-ci-files/job-linux-desktop-debian9.yml | 4 ++-- .gitlab-ci-files/job-macosx-desktop.yml | 4 ++-- .gitlab-ci-files/job-windows-desktop.yml | 4 ++-- tools/app_notarization.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml index cfeaf963e..d824c4406 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian9.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml @@ -151,7 +151,7 @@ job-debian9-makefile-clang-package: job-debian9-makefile-clang-deploy: stage: deploy tags: [ "deploy" ] - dependencies: + needs: - job-debian9-makefile-clang-package only: variables: @@ -164,7 +164,7 @@ job-debian9-makefile-clang-deploy: job-debian9-makefile-clang-plugins-deploy: stage: deploy tags: [ "deploy" ] - dependencies: + needs: - job-debian9-makefile-clang only: variables: diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index a51f95d63..bc2acad48 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -111,7 +111,7 @@ job-macosx-makefile-package: job-macosx-makefile-deploy: stage: deploy tags: [ "macosx-xcode11" ] - dependencies: + needs: - job-macosx-makefile-package only: variables: @@ -124,7 +124,7 @@ job-macosx-makefile-deploy: job-macosx-makefile-plugins-deploy: stage: deploy tags: [ "macosx-xcode11" ] - dependencies: + needs: - job-macosx-makefile only: variables: diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index b37db8988..013900526 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -103,7 +103,7 @@ job-windows-vs2017-win32-upload: variables: - $NIGHTLY_MASTER - $DEPLOY_WINDOWS - dependencies: + needs: - job-windows-vs2017-package script: - scp "build/OUTPUT/Packages/*.exe" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_DIRECTORY%" @@ -115,7 +115,7 @@ job-windows-vs2017-plugins-upload: only: variables: - $DEPLOY_PLUGINS - dependencies: + needs: - job-windows-vs2017-scheduled script: - scp "build/OUTPUT/plugins/app/*.dll" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_DIRECTORY%/plugins" diff --git a/tools/app_notarization.sh b/tools/app_notarization.sh index 25d72fab1..9677877d6 100755 --- a/tools/app_notarization.sh +++ b/tools/app_notarization.sh @@ -23,7 +23,7 @@ do xcrun_result=$? if [ "${xcrun_result}" != "0" ] then - if [ "${trycount}" -lt "4" ] + if [ ${trycount} -lt 4 ] then tryCount=$((tryCount+1)) sleep 60