Remove dependency on Protobufs, update to cargo-dist 0.6.1 (#171)

Author: NathanFlurry

.github/workflows/release.yml

@@ -59,7 +59,10 @@ jobs:
         with:
           submodules: recursive
       - name: Install cargo-dist
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh"
+        # we specify bash to get pipefail; it guards against the `curl` command
+        # failing. otherwise `sh` won't catch that `curl` returned non-0
+        shell: bash
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.6.2/cargo-dist-installer.sh | sh"
       # sure would be cool if github gave us proper conditionals...
       # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
       # functionality based on whether this is a pull_request, and whether it's from a fork.
@@ -81,7 +84,8 @@ jobs:
   build-local-artifacts:
     name: build-local-artifacts (${{ join(matrix.targets, ', ') }})
     # Let the initial task tell us to not run (currently very blunt)
-    needs: plan
+    needs:
+      - plan
     if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
     strategy:
       fail-fast: false
@@ -105,10 +109,6 @@ jobs:
         with:
           submodules: recursive
       - uses: swatinem/rust-cache@v2
-      - name: Install nix
-        uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-23.05
       - name: Install cargo-dist
         run: ${{ matrix.install_dist }}
       # Get the dist-manifest
@@ -123,7 +123,7 @@ jobs:
       - name: Build artifacts
         run: |
           # Actually do builds and make zips and whatnot
-          nix-shell --run 'cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json'
+          cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
           echo "cargo dist ran successfully"
       - id: cargo-dist
         name: Post-build
@@ -154,13 +154,13 @@ jobs:
     runs-on: "ubuntu-20.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      BUILD_MANIFEST_NAME: target/distrib/dist-manifest.json
+      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install cargo-dist
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.6.2/cargo-dist-installer.sh | sh"
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
         uses: actions/download-artifact@v3
@@ -170,7 +170,7 @@ jobs:
       - id: cargo-dist
         shell: bash
         run: |
-          nix-shell --run 'cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json'
+          cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
           echo "cargo dist ran successfully"
 
           # Parse out what we just built and upload it to scratch storage
@@ -204,7 +204,7 @@ jobs:
         with:
           submodules: recursive
       - name: Install cargo-dist
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.6.2/cargo-dist-installer.sh | sh"
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
         uses: actions/download-artifact@v3

.github/workflows/test.yml

@@ -45,10 +45,11 @@ jobs:
           nix-shell --run "cargo fmt --all --check"
 
       - name: Run cargo test
-        run: |
-          nix-shell --run "cargo test"
         env:
           RIVET_API_ENDPOINT: ${{ secrets.RIVET_API_ENDPOINT }}
           RIVET_TOKEN: ${{ secrets.RIVET_TOKEN }}
           RUST_BACKTRACE: 1
           CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG: true
+        run: |
+          nix-shell --run "cargo test"
+

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add `x86_64-unknown-linux-musl` artifact
 - Version names are now generated with incrementing indexes on the backend without race conditions
 - Warning if running unauthenticated commands as a sudo user
 - `sidekick unlink` subcommand to unlink the current project from the
@@ -23,7 +24,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `sidekick deploy` to do the process of deploying a build to Rivet
 - ability for `sidekick` to open terminal in a new window for commands
   that need to be shown (e.g. `sidekick deploy`)
-- nix to CI as `GlobalError` requires Protobuf
 - `sidekick get-version` subcommand to get the manage version URL in the
   hub
 - `sidekick get-token` subcommand to get a Rivet token for a user
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   the installation directory, preventing the need for sudo in certain cases
 - Rivet CLI now references the `rivet-cli-api` from the Rivet main repo rather
   than storing its own copy
+- Update `cargo-dist` to 0.6.2
 
 ### Fixed
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@
 Install the prerequisites:
 
 ```bash
-cargo install cargo-dist@0.5.0
+cargo install cargo-dist@0.6.2
 cargo install cargo-release@0.25.0
 ```