Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Fix build on newer versions of rust #959

Merged
merged 35 commits into from
Sep 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d2acd41
Changed array size to be 40 for E0308
rowanfr Aug 31, 2023
8bca929
Upgraded dependencies
rowanfr Sep 1, 2023
d2562e5
Added should_panic to tests
rowanfr Sep 6, 2023
d1d4b2a
Changed appveyor to use nightly
rowanfr Sep 6, 2023
efda45a
Removed stable from github actions
rowanfr Sep 6, 2023
1524913
Removed the stable requirement
rowanfr Sep 6, 2023
88f1e88
Updated nightly version in .travis.yml
rowanfr Sep 6, 2023
01b0f85
Updated sccache to use v0.5.4
rowanfr Sep 8, 2023
9a15708
Update sccache script to reflect tar internals
rowanfr Sep 8, 2023
db088b0
Incorporate the rename of sccache in the mv
rowanfr Sep 8, 2023
dbef05e
Alternate install for cross
rowanfr Sep 8, 2023
18ae8fe
Clean cargo of artifacts
rowanfr Sep 8, 2023
cc3d8da
Clear tmp file recursively
rowanfr Sep 8, 2023
0543680
Added the first backslash for /tmp
rowanfr Sep 8, 2023
7dd900b
Attempting to fix cross installation errors
rowanfr Sep 8, 2023
f6c1bc2
Testing if pure rust nightly will fix build issues
rowanfr Sep 8, 2023
7bfcbfe
Trying to do a basic log of the toolchains installed via CI
rowanfr Sep 8, 2023
7c2c68f
Further attempt at debugging
rowanfr Sep 8, 2023
1f40c2c
Revert to download of precompiled binaries for cross
rowanfr Sep 9, 2023
b8c34bd
Removed pushd inclusion
rowanfr Sep 9, 2023
cb3e402
Placed cross install before sccache
rowanfr Sep 9, 2023
56d7fb1
Reverted changes
rowanfr Sep 9, 2023
41d9ec1
Manually alter referenced installer script
rowanfr Sep 9, 2023
c833470
Further tests
rowanfr Sep 9, 2023
69a182b
Update install script
rowanfr Sep 9, 2023
ec44c5f
Echo back the url
rowanfr Sep 9, 2023
b20f576
automatically adds releases/
rowanfr Sep 9, 2023
01376cb
Trying to understand error
rowanfr Sep 9, 2023
36711ad
Log sccache
rowanfr Sep 9, 2023
7759549
change sccache version
rowanfr Sep 9, 2023
541adc6
Changed version of sccache
rowanfr Sep 9, 2023
32937a3
chore: Remove .travis.yml
Marwes Sep 9, 2023
86acf32
chore: Fix warnings
Marwes Sep 9, 2023
e6d5ca5
chore: Remove mentions of travis CI bors etc
Marwes Sep 9, 2023
37b7ab9
chore: Disable scccache on CI
Marwes Sep 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [stable, nightly]
rust: [nightly] # This should be reverted back to [stable, nightly] when 1.74 is made the rustc stable version
env:
CRATE_NAME: gluon
CARGO_INCREMENTAL: 0 # Incremental compilation is slower and bloats the cache
RUST_BACKTRACE: 1
RUSTC_WRAPPER: sccache
# RUSTC_WRAPPER: sccache
SCCACHE_CACHE_SIZE: 500M
steps:
- name: Checkout repository
Expand All @@ -30,13 +30,13 @@ jobs:
uses: hecrj/setup-rust-action@v1
with:
rust-version: ${{ matrix.rust }}
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
- run: echo "$HOME/bin" >> $GITHUB_PATH
- run: mkdir -p $HOME/bin
- name: Setup tools
if: steps.cache.outputs.cache-hit != 'true'
run: |
./scripts/install_sccache.sh $TARGET
# ./scripts/install_sccache.sh $TARGET
source ~/.cargo/env || true
./scripts/install_mdbook.sh $TARGET
- name: Run tests
Expand All @@ -45,7 +45,7 @@ jobs:
return
elif [[ -z ${WASM+set} ]]; then
mdbook build book
./scripts/travis.sh
./scripts/ci.sh
if ! git diff-index HEAD --; then
echo "Detected changes in the source after running tests"
exit 1
Expand Down
128 changes: 0 additions & 128 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Gluon can build with version 1.9.0 of Rust or later but we recommend version 1.1

To build and run all(*) tests for Gluon you can call `cargo test --features test --all`. Instead of `--all` you can pass the `-p <crate name>` and `--test <test module>` flags to compile a specific crate and/or test module. For instance, `cargo test --features test -p gluon_parser --test basic` to run the tests in [parsers/tests/basic.rs](https://github.com/gluon-lang/gluon/blob/master/parser/tests/basic.rs).

(*) You can see what Travis CI actually builds and tests in [scripts/travis.sh](https://github.com/gluon-lang/gluon/blob/master/scripts/travis.sh). Most of the time you should not need to worry about these additional tests and can just rely on travis running them.
(*) You can see what Github actions actually builds and tests in [scripts/ci.sh](https://github.com/gluon-lang/gluon/blob/master/scripts/ci.sh). Most of the time you should not need to worry about these additional tests and can just rely on CI running them.

## Pull requests

Expand Down
Loading
Loading