Merge remote-tracking branch 'origin/master' into edt-2024-2

1C-Company · Dec 20, 2024 · 521d77a · 521d77a
2 parents a5e4dd0 + 0c33787
commit 521d77a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,11 +105,19 @@ jobs:
       with:
         name: logs
         path: ./**/.log
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> origin/master
     - name: Upload WS logs on failure
       uses: actions/upload-artifact@v4
       if: always()
       with:
         name: ws-logs
+<<<<<<< HEAD
         path: ./**/target/work/data/.metadata/.log
 
+=======
+        path: tests/com.e1c.ssl.bsl.itests/target/work/data/.metadata/.log
+>>>>>>> origin/master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,19 +42,19 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Upload repo
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: repo
         path: repositories/com.e1c.ssl.repository/target/repository/
 
     - name: Upload SDK repo
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: sdk-repo
         path: repositories/com.e1c.ssl.repository.sdk/target/repository/
 
     - name: Upload JaCoCo exec data
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: jacoco
@@ -63,7 +63,7 @@ jobs:
           ./**/target/site/jacoco*/
     
     - name: Upload test logs on failure
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: logs