Better releases/profiles

wolkenwelten · Nov 5, 2022 · 6316ae9 · 6316ae9
1 parent 936ea10
commit 6316ae9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,10 +55,10 @@ jobs:
         if: matrix.build == 'x86_64-windows' || matrix.build == 'aarch64-windows'
         run: bash tools/build-windows/build.sh
 
-      - uses: actions/upload-artifact@v2.2.4
+      - uses: actions/upload-artifact@v3
         with:
           name: bins-${{ matrix.build }}
-          path: dist
+          path: dist/
 
   publish:
     name: Publish

diff --git a/Cargo.toml b/Cargo.toml
@@ -20,8 +20,11 @@ wolkenwelten-scripting = { path = "scripting" }
 wolkenwelten-sound = { path = "sound" }
 wolkenwelten-particles = { path = "particles" }
 
-[profile.opt-release]
-inherits = "release"
+[profile.dev]
+opt-level = 2
+lto = false
+
+[profile.release]
 opt-level = 3
 lto = true
 codegen-units = 1

diff --git a/tools/build-linux/build.sh b/tools/build-linux/build.sh
@@ -19,13 +19,12 @@ function cg {
 }
 cg
 
-cargo build --profile opt-release --locked
-strip target/opt-release/wolkenwelten
+cargo build --release --locked
+strip -sg target/release/wolkenwelten
 
 rm -rf ./tmp/
 mkdir -p tmp/
-cp target/opt-release/wolkenwelten tmp/wolkenwelten
-
-rm -rf ./dist/
-mkdir dist/
+cp target/release/wolkenwelten tmp/wolkenwelten && \
+rm -rf ./dist/ && \
+mkdir dist/ && \
 cd "tmp/" && tar -cJf "../dist/wolkenwelten-$VER-$ARCH.tar.xz" ./wolkenwelten
diff --git a/tools/build-macos/build.sh b/tools/build-macos/build.sh
@@ -19,16 +19,15 @@ function cg {
 }
 cg
 
-cargo build --profile opt-release --locked
-strip target/opt-release/wolkenwelten
+cargo build --release --locked
+strip -sg target/release/wolkenwelten
 
 rm -rf ./tmp/
 mkdir -p "tmp/WolkenWelten.app/Contents/MacOS"
 mkdir -p "tmp/WolkenWelten.app/Contents/Resources"
-cp "target/opt-release/wolkenwelten" "tmp/WolkenWelten.app/Contents/MacOS/wolkenwelten"
-cp "tools/build-macos/wolkenwelten.icns" "tmp/WolkenWelten.app/Contents/Resources/wolkenwelten.icns"
-cp "tools/build-macos/Info.plist" "tmp/WolkenWelten.app/Contents/Info.plist"
-
-rm -rf ./dist/
-mkdir dist/
+cp "target/release/wolkenwelten" "tmp/WolkenWelten.app/Contents/MacOS/wolkenwelten" && \
+cp "tools/build-macos/wolkenwelten.icns" "tmp/WolkenWelten.app/Contents/Resources/wolkenwelten.icns" && \
+cp "tools/build-macos/Info.plist" "tmp/WolkenWelten.app/Contents/Info.plist" && \
+rm -rf ./dist/ && \
+mkdir dist/ && \
 cd "tmp/" && tar -cJf "../dist/wolkenwelten-$VER-$ARCH.tar.xz" ./WolkenWelten.app
diff --git a/tools/build-windows/build.sh b/tools/build-windows/build.sh
@@ -19,13 +19,12 @@ function cg {
 }
 cg
 
-cargo build --profile opt-release --locked
-strip target/opt-release/wolkenwelten.exe
+cargo build --release --locked
+strip target/release/wolkenwelten.exe
 
 rm -rf ./tmp/
 mkdir -p tmp/
-cp target/opt-release/wolkenwelten.exe tmp/wolkenwelten.exe
-
-rm -rf ./dist/
-mkdir dist/
+cp target/release/wolkenwelten.exe tmp/wolkenwelten.exe && \
+rm -rf ./dist/ && \
+mkdir dist/ && \
 cd "tmp/" && 7z a "../dist/wolkenwelten-$VER-$ARCH.zip" ./wolkenwelten.exe