refaktorointia

.gitea/workflows/ci-validate.yml

@@ -8,10 +8,13 @@ on:
     secrets:
       GITEA_TOKEN:
         required: true
+      GIT_PAGES_PUBLISH_TOKEN:
+        required: true
 
 env:
   GITEA_API_URL: ${{ fromJson(inputs.env_json).GITEA_API_URL }}
   GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+  GIT_PAGES_PUBLISH_TOKEN: ${{ secrets.GIT_PAGES_PUBLISH_TOKEN }}
 
 jobs:
   validate:
@@ -30,12 +33,10 @@ jobs:
         id: validate
         run: bash .ci/scripts/ci-validate.sh
 
-      - name: Report status
-        if: always()
-        run: |
-          if [ "${{ steps.validate.outcome }}" = "success" ]; then
-            bash .ci/scripts/report-status.sh success "CI config valid" ci-validate
-          else
-            bash .ci/scripts/report-status.sh failure "CI validation FAILED" ci-validate
-            exit 1
-          fi
+      - name: Report status SUCCESS
+        if: success()
+        run: bash .ci/scripts/report-status.sh success "CI config valid" ci-validate
+
+      - name: Report status FAILURE
+        if: failure()
+        run: bash .ci/scripts/report-status.sh failure "CI validation FAILED" ci-validate

.gitea/workflows/eat-own-dogfood-cucumber-tests.yml

@@ -56,6 +56,7 @@ jobs:
 
       - name: Report status
         if: always()
+        shell: bash
         run: |
           if [ "${CUCUMBER_EXIT}" = "0" ]; then
             if [ -f "reports/${GITHUB_SHA:0:8}/cucumber/index.html" ]; then

.gitea/workflows/report-index.yml

@@ -30,12 +30,10 @@ jobs:
         id: report-index
         run: bash .ci/.gitea/scripts/generate-report-index.sh
 
-      - name: Report status
-        if: always()
-        run: |
-          if [ "${{ steps.report-index.outcome }}" = "success" ]; then
-            bash .ci/scripts/report-status.sh success "Build complete" ci-build
-          else
-            bash .ci/scripts/report-status.sh failure "Build FAILED" ci-build
-            exit 1
-          fi
+      - name: Report status SUCCESS
+        if: success()
+        run: bash .ci/scripts/report-status.sh success "Build complete" ci-build
+
+      - name: Report status FAILURE
+        if: failure()
+        run: bash .ci/scripts/report-status.sh failure "Build FAILED" ci-build