From bc015263d6206d307c82c3da6d6d614ef4c612f4 Mon Sep 17 00:00:00 2001 From: Jai A Date: Thu, 30 Mar 2023 16:18:33 -0700 Subject: [PATCH] Remove ubuntu build (for now) --- .github/workflows/cli-build.yml | 2 +- .github/workflows/tauri-build.yml | 4 ++-- theseus_cli/src/subcommands/profile.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml index d91089cce..b20e0c436 100644 --- a/.github/workflows/cli-build.yml +++ b/.github/workflows/cli-build.yml @@ -23,7 +23,7 @@ jobs: uses: actions/cache@v2 with: path: ../target/** - key: ${{ runner.os }}-theseus-cli-${{ hashFiles('Cargo.lock') }} + key: ${{ runner.os }}-theseus - name: Install toolchain uses: actions-rs/toolchain@v1 with: diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index eb8af96da..42fa64e13 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [macos-latest, ubuntu-20.04, windows-latest] + platform: [macos-latest, windows-latest] runs-on: ${{ matrix.platform }} defaults: @@ -36,7 +36,7 @@ jobs: uses: actions/cache@v2 with: path: ../target/** - key: ${{ runner.os }}-theseus-gui-${{ hashFiles('Cargo.lock') }} + key: ${{ runner.os }}-theseus - name: Get yarn cache id: yarn-cache run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/theseus_cli/src/subcommands/profile.rs b/theseus_cli/src/subcommands/profile.rs index 859749bb3..44f88977a 100644 --- a/theseus_cli/src/subcommands/profile.rs +++ b/theseus_cli/src/subcommands/profile.rs @@ -202,7 +202,7 @@ impl ProfileInit { let filter = |it: &LoaderVersion| match version.as_str() { "latest" => true, "stable" => it.stable, - id => it.id == String::from(id), + id => it.id == *id, }; let loader_data = match loader { @@ -211,7 +211,7 @@ impl ProfileInit { _ => eyre::bail!("Could not get manifest for loader {loader}. This is a bug in the CLI!"), }; - let ref loaders = loader_data.game_versions + let loaders = &loader_data.game_versions .iter() .find(|it| it.id == game_version) .ok_or_else(|| eyre::eyre!("Modloader {loader} unsupported for Minecraft version {game_version}"))?