diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index ca01ff1159..fcc69d9779 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -50,7 +50,7 @@ jobs: cd ../Mindustry - name: Create artifacts run: | - ./gradlew desktop:dist server:dist core:depsJar core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1} + ./gradlew desktop:dist server:dist core:depsJar core:assetsJar core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1} - name: Update docs run: | cd ../ @@ -97,3 +97,11 @@ jobs: file: core/build/libs/core-release-deps.jar asset_name: dependencies.jar tag: ${{ github.ref }} + + - name: Upload assets JAR + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: core/build/libs/core-release-assets.jar + asset_name: assets.jar + tag: ${{ github.ref }} diff --git a/build.gradle b/build.gradle index 52bd879096..c627f4d794 100644 --- a/build.gradle +++ b/build.gradle @@ -345,17 +345,26 @@ project(":core"){ from sourceSets.main.allSource } - task assetsJar(type: Jar, dependsOn: ":tools:pack"){ + task assetsJar(type: Jar){ archiveClassifier = 'assets' - from files("assets"){ - exclude "config", "cache", "music", "sounds", "sprites/fallback" + + into('assets'){ + from 'assets' + exclude 'config', 'cache', 'music', 'sounds', 'sprites/fallback' + } + + into('assets-raw/sprites'){ + from 'assets-raw/sprites_out' + include '**/*.png' } } task musicJar(type: Jar){ archiveClassifier = 'music' - from files("assets"){ - include "music/*", "sounds/*" + + into('assets'){ + from 'assets' + include '**/*.ogg', '**/*.mp3' } }