Merge branch 'hotfix-petrzpav' into prod-0

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.5.2] - 2023-08-06
+
+### Fixed
+
+- Academy execute job has wrong conditions.
+
 ## [0.5.1] - 2023-05-10
 
 ### Fixed
@@ -43,6 +49,7 @@ _Stable release based on [0.5.0-rc.1]._
  - Set name of distributed project as `original_project_name user_name`
 
 
+[0.5.2]: https://https://github.com/internetguru/academy/compare/v0.5.1...v0.5.2
 [0.5.1]: https://https://github.com/internetguru/academy/compare/v0.5.0...v0.5.1
 [0.5.0]: https://https://github.com/internetguru/academy/compare/v0.4.0...v0.5.0
 [0.5.0-rc.1]: https://github.com/internetguru/academy/releases/tag/v0.4.0

VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

gitlab-stages.yml

@@ -248,16 +248,6 @@ execute:
     - docker
   before_script:
     - *global_init
-    - |
-      # skip initial commits
-      if [[ $(git rev-list --all --count) -le 1 ]]; then
-        exit 0
-      fi
-      # do not evaluate ACADEMY_ASSIGN changes only
-      if [[ "$(git diff HEAD..HEAD~1 --name-only)" == "ACADEMY_ASSIGN" ]]; then
-        echo "Project execution stoped due to changes in ACADEMY_ASSIGN only"
-        exit 1
-      fi
   script:
     - echo '%% job start execute %%'
     - ${ACADEMY} execute
@@ -267,9 +257,16 @@ execute:
       - .results/
     expire_in: 1 year
   rules:
+    - if: $ACADEMY_FORCE_JOB == "true"
+      when: always
     - if: $CI_COMMIT_BRANCH == "source"
       when: manual
-    - if: '$ACADEMY_EXECUTE == "always"'
+    - changes:
+      - ACADEMY_ASSIGN
+      when: manual
+    - if: $CI_PIPELINE_IID == "1"
+      when: manual
+    - if: $ACADEMY_EXECUTE == "always"
       when: always
     - when: manual
   allow_failure: true
@@ -281,11 +278,6 @@ evaluate:
     - docker
   before_script:
     - *global_init
-    - |
-      # skip initial commits
-      if [[ $(git rev-list --all --count) -le 1 ]]; then
-        exit 0
-      fi
   script:
     - echo '%% job start evaluate %%'
     - ${ACADEMY} evaluate