From 1555738be40d8fceb1d5888ba47c3bac84f5d2c1 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 01:37:31 -0500 Subject: Fixed issues with building Sloth - Made Sloth build with Rust stable again - Made a rust-toolchain file so everyone uses the same version of Rust - Fixed the GitHub Actions to have LLVM so it can actually build - Fixed the Nix package to have LLVM so it can actually build --- .github/workflows/linting.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 685b93a..470a576 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -7,6 +7,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - run: rm rust-toolchain.toml - uses: EmbarkStudios/cargo-deny-action@v1 with: arguments: --all-features @@ -16,9 +24,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly + toolchain: nightly-2023-06-19 components: clippy, rust-src - run: cargo clippy --all-features -- --deny warnings code-format: @@ -26,8 +42,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly + toolchain: nightly-2023-06-19 components: rustfmt, rust-src - run: cargo fmt -- --check -- cgit v1.2.3 From b5650df341bbc99fe6b4cba9a9361abb430ad54b Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 01:46:11 -0500 Subject: Who needs to compile on Windows anyways? :3 --- .github/workflows/linting.yml | 3 +++ .github/workflows/testing.yml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 470a576..1a72dbc 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -36,6 +36,9 @@ jobs: with: toolchain: nightly-2023-06-19 components: clippy, rust-src + - uses: KyleMayes/install-llvm-action@v1 + with: + version: "15.0" - run: cargo clippy --all-features -- --deny warnings code-format: name: Check formatting diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 09de330..49f3799 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,7 +8,6 @@ jobs: matrix: os: - ubuntu - - windows - macos rust: - stable -- cgit v1.2.3 From a43a6c01d7d28c050967d13ca29af952a2ef4b9b Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 01:51:59 -0500 Subject: Fix caching --- .github/workflows/linting.yml | 6 +++--- .github/workflows/testing.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 1a72dbc..42b6707 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -13,7 +13,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-deplint - run: rm rust-toolchain.toml - uses: EmbarkStudios/cargo-deny-action@v1 with: @@ -30,7 +30,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-lint - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: @@ -51,7 +51,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-fmt - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 49f3799..96150cf 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -22,7 +22,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }} - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: -- cgit v1.2.3 From c51d6dd7a8113f517c6f097f05cd7ac56d986400 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 02:00:11 -0500 Subject: Updated actions/checkout & actions/cache --- .github/workflows/linting.yml | 12 ++++++------ .github/workflows/testing.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 42b6707..ba82e51 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -6,8 +6,8 @@ jobs: name: Dependency linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v3 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -23,8 +23,8 @@ jobs: name: Code linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v3 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -44,8 +44,8 @@ jobs: name: Check formatting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v3 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 96150cf..6e3269d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -15,8 +15,8 @@ jobs: name: Test Rust ${{ matrix.rust }} on ${{ matrix.os }} runs-on: ${{ matrix.os }}-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v3 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry -- cgit v1.2.3 From d72b8872c192da2136b605c8ff1b9f9f82ee8a1c Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 02:13:34 -0500 Subject: Ugggg workflows are so annoying --- .github/workflows/linting.yml | 31 +++++++++++++------------------ .github/workflows/testing.yml | 13 ++++++++++++- 2 files changed, 25 insertions(+), 19 deletions(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index ba82e51..9a05bf1 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -7,13 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-deplint - run: rm rust-toolchain.toml - uses: EmbarkStudios/cargo-deny-action@v1 with: @@ -24,34 +17,36 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: rm rust-toolchain.toml + + # Cache files like by target directory - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-lint - - run: rm rust-toolchain.toml + key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }} + + - uses: actions/cache@v3 + with: + path: llvm + key: ${{ runner.os }}-llvm-15 + + # Prepare toolchain related stuff - uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly-2023-06-19 - components: clippy, rust-src + toolchain: ${{ matrix.rust }} - uses: KyleMayes/install-llvm-action@v1 with: version: "15.0" + - run: cargo clippy --all-features -- --deny warnings code-format: name: Check formatting runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-fmt - run: rm rust-toolchain.toml - uses: dtolnay/rust-toolchain@stable with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6e3269d..66e67a9 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,6 +16,9 @@ jobs: runs-on: ${{ matrix.os }}-latest steps: - uses: actions/checkout@v3 + - run: rm rust-toolchain.toml + + # Cache files like by target directory - uses: actions/cache@v3 with: path: | @@ -23,11 +26,19 @@ jobs: ~/.cargo/git target key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - run: rm rust-toolchain.toml + + - uses: actions/cache@v3 + with: + path: llvm + key: ${{ runner.os }}-llvm-15 + + # Prepare toolchain related stuff - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.rust }} - uses: KyleMayes/install-llvm-action@v1 with: version: "15.0" + + - run: cargo build --all-features - run: cargo test --all-features --no-fail-fast -- cgit v1.2.3 From 22e683f3f9832f47a8347b9510c80ace733a3d6b Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 02:17:59 -0500 Subject: Last commit??? --- .github/workflows/linting.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 9a05bf1..4526c5c 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -36,7 +36,8 @@ jobs: # Prepare toolchain related stuff - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ matrix.rust }} + toolchain: nightly-2023-06-19 + components: clippy, rust-src - uses: KyleMayes/install-llvm-action@v1 with: version: "15.0" -- cgit v1.2.3 From 507dc8d7996ce0bd1511451d9410c87bf9477a22 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 28 Jul 2023 02:21:12 -0500 Subject: Good enough... --- .github/workflows/linting.yml | 7 +------ .github/workflows/testing.yml | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to '.github/workflows/linting.yml') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 4526c5c..473f58f 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -26,12 +26,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - uses: actions/cache@v3 - with: - path: llvm - key: ${{ runner.os }}-llvm-15 + key: ${{ runner.os }}-rustc-nightly-2023-06-19-cargo-${{ hashFiles('**/Cargo.lock') }}-linting # Prepare toolchain related stuff - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 66e67a9..ad93c36 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -27,11 +27,6 @@ jobs: target key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - uses: actions/cache@v3 - with: - path: llvm - key: ${{ runner.os }}-llvm-15 - # Prepare toolchain related stuff - uses: dtolnay/rust-toolchain@stable with: -- cgit v1.2.3