Merge branch 'master' into objectanimationjson

.github/workflows/linux.yml

@@ -27,9 +27,6 @@ jobs:
         build-type:
           - rel
           - dbg
-        include:
-          - { platform: web, lib-type: static, architecture: wasm, build-type: rel }
-          - { platform: web, lib-type: static, architecture: wasm, build-type: dbg }
     env:
       HOST: ${{ github.job }}
       PLATFORM: ${{ matrix.platform }}
@@ -39,13 +36,13 @@ jobs:
       DBE_TAG: master
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: { fetch-depth: 0 }
       - name: Source checksum
         id: source_checksum
         run: rake source_checksum
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             build/cache/.ccache
@@ -82,15 +79,15 @@ jobs:
         run: rm -rf build/cache/{.urho3d,projects}
       - name: Package
         run: script/dockerized.sh ${PLATFORM/-*} rake package
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' && !(matrix.platform == 'mingw' && matrix.lib-type == 'static' && matrix.build-type == 'dbg')
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}-${{ matrix.lib-type }}-${{ matrix.architecture }}-${{ matrix.build-type }}
           path: |
             build/ci/*.tar.gz
             build/*.out
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' && !(matrix.platform == 'mingw' && matrix.lib-type == 'static' && matrix.build-type == 'dbg')
         continue-on-error: ${{ !startsWith(github.ref, 'refs/tags/') }}
       - name: Publish
         env:

CMakeLists.txt

@@ -153,6 +153,7 @@ elseif (ARM_ABI_FLAGS)
     string (TOUPPER "${CPU_NAME}" CPU_NAME)
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}${CPU_NAME})
 endif ()
+set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-${CMAKE_BUILD_TYPE})
 if (NOT DEFINED ENV{RELEASE_TAG})
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-snapshot)
 endif ()

Source/Urho3D/Scene/Animatable.cpp

@@ -100,7 +100,7 @@ bool Animatable::LoadXML(const XMLElement& source)
         if (!attributeAnimation->LoadXML(elem))
             return false;
 
-        String wrapModeString = source.GetAttribute("wrapmode");
+        String wrapModeString = elem.GetAttribute("wrapmode");
         WrapMode wrapMode = WM_LOOP;
         for (int i = 0; i <= WM_CLAMP; ++i)
         {

rakefile

@@ -185,7 +185,9 @@ task :check_license do
     commit = 1
   end
   # TODO: Check and merge any new 3rd-party license into 'Source/ThirdParty/LICENSES'
-  puts "::set-output name=commit::#{commit}"
+  File.open(ENV['GITHUB_OUTPUT'], 'a') do |file|
+    file.puts "commit=#{commit}"
+  end
 end
 
 task :ci do
@@ -341,7 +343,13 @@ task :source_checksum do
   sha256_final = Digest::SHA256.new
   sha256_iter = Digest::SHA256
   Dir['Source/**/*.{c,h}*'].each { |it| sha256_final << sha256_iter.file(it).hexdigest }
-  puts "::set-output name=hexdigest::#{sha256_final.hexdigest}"
+  if (ENV['CI'])
+    File.open(ENV['GITHUB_OUTPUT'], 'a') do |file|
+      file.puts "hexdigest=#{sha256_final.hexdigest}"
+    end
+  else
+    puts "hexdigest=#{sha256_final.hexdigest}"
+  end
 end
 
 task :update_dot_files do
@@ -361,7 +369,7 @@ task :update_dot_files do
       git add script/.build-options script/.env-file && \\
       commit=0 && \\
       if git commit -qm 'GH Actions: Update dot files for DBE.'; then commit=1; fi && \\
-      echo ::set-output name=commit::$commit
+      echo "commit=$commit" >> $GITHUB_OUTPUT
     } or abort "Failed to commit dot files update"
   end
 end