Replace release action in workflow

.github/workflows/release.yaml

@@ -27,41 +27,63 @@ jobs:
         run: |
           cargo build --release --no-default-features --features=${{ matrix.features }}
 
-      - name: Upload debug & globe_view binary
+      - name: Upload debug & globe_view binary (Unix)
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.features == 'debug,globe_view' }}
+        if: ${{ matrix.os != 'windows-2022' && matrix.features == 'debug,globe_view' }}
+        with:
+          name: worlds-rs-${{ matrix.os }}-debug-globe_view
+          path: |
+            target/release/worlds-sim-rust
+      - name: Upload debug & render binary (Unix)
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.os != 'windows-2022' && matrix.features == 'debug,render' }}
+        with:
+          name: worlds-rs-${{ matrix.os }}-debug-render
+          path: |
+            target/release/worlds-sim-rust
+      - name: Upload non-debug binary (Unix)
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.os != 'windows-2022' && !contains(matrix.features, ',') && matrix.features != '' }}
+        with:
+          name: worlds-rs-${{ matrix.os }}-${{ matrix.features }}
+          path: |
+            target/release/worlds-sim-rust
+      - name: Upload basic binary (Unix)
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.os != 'windows-2022' && matrix.features == '' }}
+        with:
+          name: worlds-rs-${{ matrix.os }}-minimal
+          path: |
+            target/release/worlds-sim-rust
+
+      - name: Upload debug & globe_view binary (Windows)
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.os == 'windows-2022' && matrix.features == 'debug,globe_view' }}
         with:
           name: worlds-rs-${{ matrix.os }}-debug-globe_view
           path: |
             target/release/worlds-sim-rust.exe
-            target/release/worlds-sim-rust
+      - name: Upload debug & render binary (Windows)
-
-      - name: Upload debug & render binary
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.features == 'debug,render' }}
+        if: ${{ matrix.os == 'windows-2022' && matrix.features == 'debug,render' }}
         with:
           name: worlds-rs-${{ matrix.os }}-debug-render
           path: |
             target/release/worlds-sim-rust.exe
-            target/release/worlds-sim-rust
+      - name: Upload non-debug binary (Windows)
-
-      - name: Upload non-debug binary
         uses: actions/upload-artifact@v3
-        if: ${{ !contains(matrix.features, ',') && matrix.features != '' }}
+        if: ${{ matrix.os == 'windows-2022' && !contains(matrix.features, ',') && matrix.features != '' }}
         with:
           name: worlds-rs-${{ matrix.os }}-${{ matrix.features }}
           path: |
             target/release/worlds-sim-rust.exe
-            target/release/worlds-sim-rust
+      - name: Upload basic binary (Windows)
-
-      - name: Upload basic binary
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.features == '' }}
+        if: ${{ matrix.os == 'windows-2022' && matrix.features == '' }}
         with:
           name: worlds-rs-${{ matrix.os }}-minimal
           path: |
             target/release/worlds-sim-rust.exe
-            target/release/worlds-sim-rust
 
   create-tag:
     name: "Create tag"
@@ -70,7 +92,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: rickstaa/action-create-tag@v1
         with:
-          tag: "pre-release"
+          tag: latest
           message: "Latest pre-release"
           force_push_tag: true
 
@@ -81,87 +103,29 @@ jobs:
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: worlds-rs-windows-2022-debug-globe_view
+          path: /tmp/downloads/
-          path: ~/download/worlds-rs-windows-2022-debug-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-windows-2022-debug-render
-          path: ~/download/worlds-rs-windows-2022-debug-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-windows-2022-debug
-          path: ~/download/worlds-rs-windows-2022-debug.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-windows-2022-globe_view
-          path: ~/download/worlds-rs-windows-2022-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-windows-2022-render
-          path: ~/download/worlds-rs-windows-2022-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-windows-2022-minimal
-          path: ~/download/worlds-rs-windows-2022-minimal.zip
 
-      - uses: actions/download-artifact@v3
+      - name: Create packaged files
-        with:
-          name: worlds-rs-ubuntu-22.04-debug-globe_view
-          path: ~/download/worlds-rs-ubuntu-22.04-debug-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-ubuntu-22.04-debug-render
-          path: ~/download/worlds-rs-ubuntu-22.04-debug-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-ubuntu-22.04-debug
-          path: ~/download/worlds-rs-ubuntu-22.04-debug.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-ubuntu-22.04-globe_view
-          path: ~/download/worlds-rs-ubuntu-22.04-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-ubuntu-22.04-render
-          path: ~/download/worlds-rs-ubuntu-22.04-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-ubuntu-22.04-minimal
-          path: ~/download/worlds-rs-ubuntu-22.04-minimal.zip
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-debug-globe_view
-          path: ~/download/worlds-rs-macos-12-debug-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-debug-render
-          path: ~/download/worlds-rs-macos-12-debug-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-debug
-          path: ~/download/worlds-rs-macos-12-debug.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-globe_view
-          path: ~/download/worlds-rs-macos-12-globe_view.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-render
-          path: ~/download/worlds-rs-macos-12-render.zip
-      - uses: actions/download-artifact@v3
-        with:
-          name: worlds-rs-macos-12-minimal
-          path: ~/download/worlds-rs-macos-12-minimal.zip
-
-      - name: List artifacts
         run: |
-          ls -la --color=auto /home/runner/download/
+          cd /tmp/downloads/
+          for dir in */; do
+            echo "creating $(pwd)/${dir%/}.zip"
+            ( cd "$dir" && zip -9 -r ../"${dir%/}".zip . )
+            echo "created $(pwd)/${dir%/}.zip"
+            file "$(pwd)/${dir%/}.zip"
+          done
+          cd -
 
+      - name: List all artifact files
+        run: ls -la --color=auto /tmp/downloads/*.zip
+
+      - uses: actions/checkout@v3
       - name: Upload binaries
-        uses: softprops/action-gh-release@v1
+        uses: marvinpinto/action-automatic-releases@v1.2.1
-        with:
+        with: 
-            files: /home/runner/download/*
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-            prerelease: true
+          title: "Latest build"
-            tag_name: "pre-release"
+          prerelease: true
-            generate_release_notes: true
+          files: |
+            /tmp/downloads/*.zip
+          automatic_release_tag: latest

Cargo.lock

@@ -1513,9 +1513,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
 
 [[package]]
 name = "libloading"
@@ -1529,9 +1529,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1813,9 +1813,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "owned_ttf_parser"
@@ -2552,7 +2552,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
 dependencies = [
  "dlib",
- "lazy_static",
  "pkg-config",
 ]
 
@@ -2774,7 +2773,6 @@ dependencies = [
  "bevy",
  "bevy_pancam",
  "planet",
- "winit",
 ]
 
 [[package]]

Cargo.toml

@@ -4,13 +4,10 @@ version = "0.1.0"
 edition = "2021"
 resolver = "2"
 
-[target.'cfg(target_os = "linux")'.dependencies]
-winit = { version = "0.26.1", features=["x11"] }
-
 [features]
 debug = ["planet/debug"]
 globe_view = ["planet/globe_view", "render"]
-render = ["bevy/bevy_asset", "bevy/bevy_winit", "bevy/render", "planet/render", "dep:bevy_pancam"]
+render = ["bevy/bevy_asset", "bevy/bevy_winit", "bevy/x11", "bevy/wayland", "bevy/render", "planet/render", "dep:bevy_pancam"]
 default = ["render", "debug"]
 
 [dependencies.planet]