fixing stuff

foxgirl-labs · Nov 28, 2024 · cb93b7e · cb93b7e
1 parent 83921a2
commit cb93b7e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/build-gh-pages.yml b/.github/workflows/build-gh-pages.yml
@@ -130,7 +130,11 @@ jobs:
 
       # Copy Assets
       - name: Copy Assets
-        run: cp -af ${{ github.workspace }}/client/assets ${{ github.workspace }}/docs
+        run: |
+          mkdir -p ${{ github.workspace }}/docs/resources
+
+          # cp -af ${{ github.workspace }}/resources/wasm ${{ github.workspace }}/docs/resources
+          cp -af ${{ github.workspace }}/resources/assets ${{ github.workspace }}/docs/resources
 
       # Copy Docs
       - name: Copy Docs

diff --git a/.github/workflows/build-linux-gnu-x86_64.yml b/.github/workflows/build-linux-gnu-x86_64.yml
@@ -113,10 +113,12 @@ jobs:
       # Prepare Artifact Uploads
       - name: Prepare Artifact Uploads (Client/Server)
         run: |
-          mkdir -p ${{ github.workspace }}/upload/client-server
+          mkdir -p ${{ github.workspace }}/upload/client-server/resources
           cp -a ${{ github.workspace }}/target/x86_64-unknown-linux-gnu/release/catgirl-engine ${{ github.workspace }}/upload/client-server
           cp -a ${{ github.workspace }}/target/binding ${{ github.workspace }}/upload/client-server
-          cp -a ${{ github.workspace }}/client/assets ${{ github.workspace }}/upload/client-server
+
+          cp -a ${{ github.workspace }}/resources/linux ${{ github.workspace }}/upload/client-server/resources
+          cp -a ${{ github.workspace }}/resources/assets ${{ github.workspace }}/upload/client-server/resources
 
       # Sign Files
       - name: Sign Files (Client/Server)

diff --git a/.github/workflows/build-linux-musl-x86_64.yml b/.github/workflows/build-linux-musl-x86_64.yml
@@ -113,10 +113,13 @@ jobs:
       # Prepare Artifact Uploads
       - name: Prepare Artifact Uploads (Server)
         run: |
-          mkdir -p ${{ github.workspace }}/upload/server
+          mkdir -p ${{ github.workspace }}/upload/server  # /resources
           cp -a ${{ github.workspace }}/target/x86_64-unknown-linux-musl/release/catgirl-engine ${{ github.workspace }}/upload/server/catgirl-engine-server
           cp -a ${{ github.workspace }}/target/binding ${{ github.workspace }}/upload/server
 
+          # cp -a ${{ github.workspace }}/resources/linux ${{ github.workspace }}/upload/server/resources
+          # cp -a ${{ github.workspace }}/resources/assets ${{ github.workspace }}/upload/server/resources
+
       # Sign Files
       - name: Sign Files (Server)
         run: |

diff --git a/.github/workflows/build-wasm32-unknown-unknown.yml b/.github/workflows/build-wasm32-unknown-unknown.yml
@@ -136,13 +136,15 @@ jobs:
       # Prepare Artifact Uploads
       - name: Prepare Artifact Uploads (Client/Server)
         run: |
-          mkdir -p ${{ github.workspace }}/upload/wasm
+          mkdir -p ${{ github.workspace }}/upload/wasm/resources
           cp -a ${{ github.workspace }}/pkg ${{ github.workspace }}/upload/wasm
           cp -a ${{ github.workspace }}/examples/wasm/web/index.html ${{ github.workspace }}/upload/wasm
           cp -a ${{ github.workspace }}/examples/wasm/web/manifest.json ${{ github.workspace }}/upload/wasm
           cp -a ${{ github.workspace }}/examples/wasm/web/service-worker.js ${{ github.workspace }}/upload/wasm
           cp -a ${{ github.workspace }}/target/binding ${{ github.workspace }}/upload/wasm
-          cp -a ${{ github.workspace }}/client/assets ${{ github.workspace }}/upload/wasm
+
+          # cp -af ${{ github.workspace }}/resources/wasm ${{ github.workspace }}/upload/wasm/resources
+          cp -a ${{ github.workspace }}/resources/assets ${{ github.workspace }}/upload/wasm/resources
 
       # Sign Files
       - name: Sign Files (Client/Server)

diff --git a/.github/workflows/build-windows-gnu-x86_64.yml b/.github/workflows/build-windows-gnu-x86_64.yml
@@ -130,18 +130,23 @@ jobs:
       # Prepare Artifact Uploads
       - name: Prepare Artifact Uploads (Client/Server)
         run: |
-          mkdir -p ${{ github.workspace }}/upload/client-server
+          mkdir -p ${{ github.workspace }}/upload/client-server/resources
           cp -a ${{ github.workspace }}/target/x86_64-pc-windows-gnu/release/*.exe ${{ github.workspace }}/upload/client-server
           cp -a ${{ github.workspace }}/target/binding ${{ github.workspace }}/upload/client-server
-          cp -a ${{ github.workspace }}/client/assets ${{ github.workspace }}/upload/client-server
+
+          # cp -a ${{ github.workspace }}/resources/windows ${{ github.workspace }}/upload/client-server/resources
+          cp -a ${{ github.workspace }}/resources/assets ${{ github.workspace }}/upload/client-server/resources
 
       # Prepare Artifact Uploads
       - name: Prepare Artifact Uploads (Server)
         run: |
-          mkdir -p ${{ github.workspace }}/upload/server
+          mkdir -p ${{ github.workspace }}/upload/server  # /resources
           cp -a ${{ github.workspace }}/.server-target/x86_64-pc-windows-gnu/release/catgirl-engine.exe ${{ github.workspace }}/upload/server/catgirl-engine-server.exe
           cp -a ${{ github.workspace }}/.server-target/binding ${{ github.workspace }}/upload/server
 
+          # cp -a ${{ github.workspace }}/resources/windows ${{ github.workspace }}/upload/server/resources
+          # cp -a ${{ github.workspace }}/resources/assets ${{ github.workspace }}/upload/server/resources
+
       # Sign Files
       - name: Sign Files (Client/Server)
         run: |

diff --git a/.github/workflows/publish-to-repositories.yml b/.github/workflows/publish-to-repositories.yml
@@ -95,13 +95,6 @@ jobs:
       - name: Check Files with Pre-Commit Hooks
         run: pre-commit run --all-files
 
-      # Copy Desktop and Icon Files (For Crate AUR Install)
-      - name: Copy Desktop and Icon Files
-        run: |
-          mkdir -p ${{ github.workspace }}/install
-          cp -a ${{ github.workspace }}/client/assets/resources/catgirl-engine.desktop ${{ github.workspace }}/install
-          cp -a ${{ github.workspace }}/client/assets/vanilla/texture/logo/logo.svg ${{ github.workspace }}/install/catgirl-engine.svg
-
       # Publish to Crates.io
       - name: Publish to catgirl-engine-macros to Crates.io
         run: cargo publish -p catgirl-engine-macros --no-verify