From 2641df118238caa8ca39178448b8e4c763bdaea3 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sat, 25 Sep 2021 17:02:44 -0400
Subject: [PATCH] Release instructions

---
 .editorconfig                                 |  6 ++++
 .github/workflows/build.yml                   | 30 +++++++++++++++++++
 .vscode/extensions.json                       | 13 ++++++++
 .vscode/tasks.json                            | 23 ++++++++++++++
 Cross.toml                                    |  2 ++
 README.md                                     | 23 ++++++++++++--
 .../x86_64-unknown-linux-gnu.dockerfile       |  4 +++
 game/Cargo.toml                               |  5 +++-
 rust-toolchain.toml                           |  4 ++-
 9 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/tasks.json
 create mode 100644 Cross.toml
 create mode 100644 bundle/docker/x86_64-unknown-linux-gnu.dockerfile

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..589f816
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..b24baa9
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,30 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest,  windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Install Raylib deps
+        if: runner.os == 'Linux'
+        run: sudo apt-get install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev -y
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --all-features
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..9e89f9f
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,13 @@
+{
+    "recommendations": [
+        "editorconfig.editorconfig",
+        "matklad.rust-analyzer",
+        "serayuzgur.crates",
+        "bungcip.better-toml",
+        "aaron-bond.better-comments",
+        "streetsidesoftware.code-spell-checker",
+        "codezombiech.gitignore",
+        "ionutvmi.path-autocomplete",
+        "ms-vsliveshare.vsliveshare"
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..20c9cbe
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "cargo",
+			"command": "build",
+			"problemMatcher": [
+				"$rustc"
+			],
+			"group": "build",
+			"label": "Rust: Build Code"
+		},
+		{
+			"type": "cargo",
+			"command": "run",
+			"problemMatcher": [
+				"$rustc"
+			],
+			"group": "build",
+			"label": "Rust: Run Game"
+		}
+	]
+}
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..a23a6e4
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,2 @@
+[target.x86_64-unknown-linux-gnu]
+image = "ldjam_49_x86_64_unknown_linux_gnu_build_env"
diff --git a/README.md b/README.md
index 8347852..40cd663 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,26 @@
 
 - `game`: Contains the game code and assets
   - `src`: Rust code
-    - `lib.rs`: The game's main file
+    - [`lib.rs`](game/src/lib.rs): The game's main file
   - `assets`: Any files to be embedded directly into the final game executable (managed by [`game::utilities::datastore::StaticGameData`](game/src/utilities/datastore.rs) using the [`rust-embed`](https://github.com/pyros2097/rust-embed) library)
   - `Cargo.toml`: The game's dependencies
-- `wrapper`: This is just a small hack to improve the compile times of the game. Don't mess with anything in here
\ No newline at end of file
+- `wrapper`: This is just a small hack to improve the compile times of the game. Don't mess with anything in here
+
+## Building for release
+
+These steps should only be followed by whoever is building the final game executables for release. This is *not needed* for development.
+
+Firstly, ensure the docker images are built:
+
+```sh
+docker build -t ldjam_49_x86_64_unknown_linux_gnu_build_env -f ./bundle/docker/x86_64-unknown-linux-gnu.dockerfile .
+```
+
+Then, build in release mode for targeted platforms:
+
+```sh
+cross build --release --target x86_64-unknown-linux-gnu
+cross build --release --target x86_64-pc-windows-gnu
+```
+
+The resulting binaries will be in the `target` directory. Make sure to rename the executables before release.
diff --git a/bundle/docker/x86_64-unknown-linux-gnu.dockerfile b/bundle/docker/x86_64-unknown-linux-gnu.dockerfile
new file mode 100644
index 0000000..cd2dc42
--- /dev/null
+++ b/bundle/docker/x86_64-unknown-linux-gnu.dockerfile
@@ -0,0 +1,4 @@
+FROM rustembedded/cross:x86_64-unknown-linux-gnu-0.2.1
+
+RUN apt-get update -y
+RUN apt-get install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev -y
diff --git a/game/Cargo.toml b/game/Cargo.toml
index 70c66ce..2cceef0 100644
--- a/game/Cargo.toml
+++ b/game/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 cgmath = "0.18"
-discord-sdk = "0.1"
+discord-sdk = { version = "0.1.4", git = "https://github.com/EmbarkStudios/discord-sdk", branch = "main", commit = "3ed27a06c71d88269c7ac29cf5151cfb7f24f0ef" }
 tokio = { version = "1.0", features = ["macros"] }
 tracing = { version = "0.1", features = ["log"] }
 serde = { version = "1.0.126", features = ["derive"] }
@@ -19,6 +19,9 @@ raylib = "3.5"
 puffin = "0.9"
 puffin_http = "0.6"
 
+[dev-dependencies]
+puffin_viewer = "0.6"
+
 [profile.release]
 lto = true
 codegen-units = 1
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7258164..fb88857 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -5,4 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "beta"
\ No newline at end of file
+# Make sure to check the build status before changing this
+# https://rust-lang.github.io/rustup-components-history/
+channel = "nightly-2021-09-25"