fix: Поставил точки с запятой после команд

Diversus23 · Nov 6, 2024 · 96a0eff · 96a0eff
1 parent 2910e45
commit 96a0eff
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/yml/epferf_thin_thick.yml b/yml/epferf_thin_thick.yml
@@ -200,28 +200,28 @@ SonarQube:
     # Обфускация внешних отчетов и обработок в корне и создание архивов для всех файлов *.epf, *.erf
     - foreach ($f in $files)
         {
-          $fileName = $f.Name
-          $baseName = $f.Basename
-          $fileFullName = $f.FullName
-          precommit1c --decompile "$fileFullName" "$CI_PROJECT_DIR\build"
-          oscript -encoding=utf-8 $ACTIONS netlenka module --in "$CI_PROJECT_DIR\build\$baseName\ObjectModule.bsl" --apikey $NETLENKA_APIKEY
-          precommit1c --compile "$CI_PROJECT_DIR\build\$baseName" "$CI_PROJECT_DIR\build\distrib"
-          $distribFileName = "$CI_PROJECT_DIR\build\distrib\$fileName"
+          $fileName = $f.Name;
+          $baseName = $f.Basename;
+          $fileFullName = $f.FullName;
+          precommit1c --decompile "$fileFullName" "$CI_PROJECT_DIR\build";
+          oscript -encoding=utf-8 $ACTIONS netlenka module --in "$CI_PROJECT_DIR\build\$baseName\ObjectModule.bsl" --apikey $NETLENKA_APIKEY;
+          precommit1c --compile "$CI_PROJECT_DIR\build\$baseName" "$CI_PROJECT_DIR\build\distrib";
+          $distribFileName = "$CI_PROJECT_DIR\build\distrib\$fileName";
 
-          oscript -encoding=utf-8 $ACTIONS fs copy --from "$distribFileName" --to "$CI_PROJECT_DIR\build\artifacts\$baseName"
-          oscript -encoding=utf-8 $ACTIONS fs copy --from "$CI_PROJECT_DIR\docs\*.pdf" --to "$CI_PROJECT_DIR\build\artifacts\$baseName"
-          oscript -encoding=utf-8 $ACTIONS fs copy --from "$CI_PROJECT_DIR\build\news\letter.html" --to "$CI_PROJECT_DIR\build\artifacts\$baseName"
-          Rename-Item -Path "$CI_PROJECT_DIR\build\artifacts\$baseName\letter.html" -NewName "README.html"
+          oscript -encoding=utf-8 $ACTIONS fs copy --from "$distribFileName" --to "$CI_PROJECT_DIR\build\artifacts\$baseName";
+          oscript -encoding=utf-8 $ACTIONS fs copy --from "$CI_PROJECT_DIR\docs\*.pdf" --to "$CI_PROJECT_DIR\build\artifacts\$baseName";
+          oscript -encoding=utf-8 $ACTIONS fs copy --from "$CI_PROJECT_DIR\build\news\letter.html" --to "$CI_PROJECT_DIR\build\artifacts\$baseName";
+          Rename-Item -Path "$CI_PROJECT_DIR\build\artifacts\$baseName\letter.html" -NewName "README.html";
 
-          $CONFIG_VERSION = oscript -encoding=utf-8 $ACTIONS json read --file "$CI_PROJECT_DIR\settings.json" --key "default.version"
-          $ARTIFACT_NAME = $CI_PROJECT_NAME + "_" + $CONFIG_VERSION.Replace(".", "_")
-          $ARTIFACT_NAME_FULL = $ARTIFACT_NAME + "_full.zip"
-          $ARTIFACT_NAME_UPD = $ARTIFACT_NAME + "_upd.zip"
-          oscript -encoding=utf-8 $ACTIONS zip add --file "$CI_PROJECT_DIR\build\artifacts\$ARTIFACT_NAME_FULL" --mask "$CI_PROJECT_DIR\build\artifacts\$baseName\*.*"
-          oscript -encoding=utf-8 $ACTIONS zip add --file "$CI_PROJECT_DIR\build\artifacts\$ARTIFACT_NAME_UPD" --mask "$CI_PROJECT_DIR\build\artifacts\$baseName\*.*"
+          $CONFIG_VERSION = oscript -encoding=utf-8 $ACTIONS json read --file "$CI_PROJECT_DIR\settings.json" --key "default.version";
+          $ARTIFACT_NAME = $CI_PROJECT_NAME + "_" + $CONFIG_VERSION.Replace(".", "_");
+          $ARTIFACT_NAME_FULL = $ARTIFACT_NAME + "_full.zip";
+          $ARTIFACT_NAME_UPD = $ARTIFACT_NAME + "_upd.zip";
+          oscript -encoding=utf-8 $ACTIONS zip add --file "$CI_PROJECT_DIR\build\artifacts\$ARTIFACT_NAME_FULL" --mask "$CI_PROJECT_DIR\build\artifacts\$baseName\*.*";
+          oscript -encoding=utf-8 $ACTIONS zip add --file "$CI_PROJECT_DIR\build\artifacts\$ARTIFACT_NAME_UPD" --mask "$CI_PROJECT_DIR\build\artifacts\$baseName\*.*";
 
-          aws.exe s3 cp "$CI_PROJECT_DIR\build\artifacts" "s3://$AWS_BUCKET/distrib/$CI_PROJECT_NAME" --endpoint-url $AWS_HOSTNAME --recursive --exclude "*" --include "$ARTIFACT_NAME_FULL"
-          aws.exe s3 cp "$CI_PROJECT_DIR\build\artifacts" "s3://$AWS_BUCKET/distrib/$CI_PROJECT_NAME" --endpoint-url $AWS_HOSTNAME --recursive --exclude "*" --include "$ARTIFACT_NAME_UPD"
+          aws.exe s3 cp "$CI_PROJECT_DIR\build\artifacts" "s3://$AWS_BUCKET/distrib/$CI_PROJECT_NAME" --endpoint-url $AWS_HOSTNAME --recursive --exclude "*" --include "$ARTIFACT_NAME_FULL";
+          aws.exe s3 cp "$CI_PROJECT_DIR\build\artifacts" "s3://$AWS_BUCKET/distrib/$CI_PROJECT_NAME" --endpoint-url $AWS_HOSTNAME --recursive --exclude "*" --include "$ARTIFACT_NAME_UPD";
         }
   allow_failure: false
   artifacts:
@@ -234,5 +234,4 @@ SonarQube:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $LaunchMode == "BUILD"'
     - if: '$CI_PIPELINE_SOURCE == "web" && $LaunchMode == "BUILD" && $CI_COMMIT_REF_NAME == "release"'
-    - if: '$CI_COMMIT_REF_NAME == "release"'
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "release"'
+    - if: '$CI_COMMIT_REF_NAME == "release"'