Bevy Rewrite

.dockerignore

@@ -0,0 +1,2 @@
+/target
+/web-target

.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig file: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[*.ts]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.yml]
+indent_size = 2

.github/workflows/build-matchmaker.yml

@@ -0,0 +1,67 @@
+#
+# Builds the matchmaking server docker image
+#
+name: Build & Publish Matchmaker Docker Image
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+
+env:
+  RELEASE_VERSION: ${{ github.ref_name }}
+
+jobs:
+  build-and-publish:
+    name: Build and Publish Container
+    runs-on: ubuntu-latest
+    env:
+      DEPLOY_HOOK: ${{ secrets.DEPLOY_HOOK }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository }}-matchmaker
+
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Re-deploy Container
+        run: |
+          $DEPLOY_HOOK

.github/workflows/ci.yml

@@ -1,94 +1,70 @@
-name: Continuous integration
+name: CI
 
 on:
   push:
     branches:
-      - main
-    paths-ignore:
-      - "**.md"
-      - "**.json"
+      - master
+      - staging
+      - trying
   pull_request:
-    paths-ignore:
-      - "**.md"
-      - "**.json"
 
 jobs:
-  fmt:
+  check_formatting:
     runs-on: ubuntu-latest
-    name: Formatting
+    name: Check Rust formatting
     steps:
-      - uses: actions/checkout@v2
-      - name: Check Rust formatting
-        uses: actions-rs/cargo@v1
+      - uses: actions/checkout@v3
+      - name: Install Rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          components: rustfmt
+      - uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
 
-  clippy:
+  clippy_correctness_checks:
     runs-on: ubuntu-latest
-    name: Linting
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
-              libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
-              libudev-dev
-      - name: Install Clippy
-        run: rustup component add clippy
-
-      - name: Run Clippy
-        run: cargo clippy -- -W clippy::correctness -D warnings
-
-  build:
-    name: Build
-    runs-on: ${{ matrix.config.os }}
+    name: Clippy correctness checks
     strategy:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, target: "x86_64-unknown-linux-gnu" }
-          - { os: macos-latest, target: "x86_64-apple-darwin" }
-          - { os: macos-latest, target: "aarch64-apple-darwin" }
-          - { os: windows-latest, target: "x86_64-pc-windows-msvc" }
-          - { os: windows-latest, target: "i686-pc-windows-msvc" }
-        profile: ["--release"]
-
+          - { target: 'x86_64-unknown-linux-gnu', target_dir: 'target' }
+          # Disable WASM Target until we fix WASM compile
+          # - { target: 'wasm32-unknown-unknown', target_dir: 'web-target' }
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
       - name: Install dependencies
-        if: matrix.config.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
+          sudo apt-get install -y -q \
               libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
               libudev-dev
-      - name: Cache Cargo dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
-      - name: Setup Rust
+      - uses: actions/checkout@v3
+      - name: Install WASM Target
+        if: matrix.config.target == 'wasm32-unknown-unknown'
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          override: true
-          profile: minimal
           target: ${{ matrix.config.target }}
+          components: clippy
+      - name: Install Clippy
+        if: matrix.config.target != 'wasm32-unknown-unknown'
+        uses: actions-rs/toolchain@v1
+        with:
+          components: clippy
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+            web-target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - uses: actions-rs/cargo@v1
+        env:
+          CARGO_TARGET_DIR: ${{ matrix.config.target_dir }}
         with:
-          command: build
-          args: --locked --target ${{ matrix.config.target }} ${{ matrix.profile }}
+          command: clippy
+          args: --target ${{ matrix.config.target }} -- -W clippy::correctness -D warnings

.github/workflows/release.yml

@@ -1,11 +1,14 @@
-# This action will generate Windows|Linux|MacOS binary releases
-
-name: Release
+name: CD
 
 on:
   push:
+    branches:
+      - main
     tags:
-      - "v*"
+      - 'v*'
+
+env:
+  RELEASE_VERSION: ${{ github.ref_name }}
 
 jobs:
   build_release:
@@ -16,38 +19,31 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, target: "x86_64-unknown-linux-gnu" }
-          - { os: macos-latest, target: "x86_64-apple-darwin" }
-          - { os: macos-latest, target: "aarch64-apple-darwin" }
-          - { os: windows-latest, target: "x86_64-pc-windows-msvc" }
-          - { os: windows-latest, target: "i686-pc-windows-msvc" }
+          - { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
+          - { os: macos-latest, target: 'x86_64-apple-darwin' }
+          - { os: macos-latest, target: 'aarch64-apple-darwin' }
+          - { os: windows-latest, target: 'x86_64-pc-windows-msvc' }
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set the release version
-        shell: bash
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         if: matrix.config.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
+          sudo apt-get install -y -q \
               libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
               libudev-dev
 
-      - name: Cache Cargo
-        uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Setup Rust
@@ -60,9 +56,6 @@ jobs:
 
       - name: Build
         uses: actions-rs/cargo@v1
-        env:
-          SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
-          RUSTFLAGS: -L /usr/lib/x86_64-linux-gnu
         with:
           command: build
           args: --release --locked --target ${{ matrix.config.target }}
@@ -76,10 +69,8 @@ jobs:
           echo "ARTIFACT_PATH=$artifact_path" >> $GITHUB_ENV
           mkdir $release_dir
           cp target/${{ matrix.config.target }}/release/jumpy.exe $release_dir/
-          strip $release_dir/jumpy.exe
-          find assets -name "*.schema.json" -exec rm -f {} \;
-          cp -R assets/ mods/ licenses/ $release_dir/
-          cp LICENSE $release_dir/licenses/
+          cp -R assets/ $release_dir/
+          cp LICENSE $release_dir/
           7z a -tzip $artifact_path $release_dir/
 
       - name: Prepare artifacts [Unix]
@@ -91,10 +82,8 @@ jobs:
           echo "ARTIFACT_PATH=$artifact_path" >> $GITHUB_ENV
           mkdir $release_dir
           cp target/${{ matrix.config.target }}/release/jumpy $release_dir/
-          strip $release_dir/jumpy || true
-          find assets -name "*.schema.json" -exec rm -f {} \;
-          cp -R assets mods licenses $release_dir
-          cp LICENSE $release_dir/licenses
+          cp -R assets $release_dir
+          cp LICENSE $release_dir
           tar -czvf $artifact_path $release_dir/
 
       - name: Deploy | Upload artifacts
@@ -111,14 +100,20 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download Artifacts
         uses: actions/download-artifact@v2
 
-      - name: Set the release version
+      - name: Set stable release name
+        shell: bash
+        if: env.release_VERSION != 'main'
+        run: echo "RELEASE_NAME=Jumpy ${GITHUB_REF:10}" >> $GITHUB_ENV
+
+      - name: Set pre-release name
         shell: bash
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+        if: env.release_VERSION == 'main'
+        run: echo "RELEASE_NAME=Jumpy Dev Snapshot" >> $GITHUB_ENV
 
       - name: Generate Checksums
         run: for file in jumpy-*/jumpy-*; do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
@@ -130,6 +125,7 @@ jobs:
           file: jumpy-*/jumpy-*
           file_glob: true
           overwrite: true
-          body: "Fish Folk: Jumpy ${{ env.RELEASE_VERSION }} 🐟"
+          prerelease: ${{ env.RELEASE_VERSION == 'main' }}
+          body: '${{ env.RELEASE_NAME }}'
           tag: ${{ github.ref }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}