Skip to content

Commit

Permalink
Merge pull request #959 from Marwes/remove_travis
Browse files Browse the repository at this point in the history
chore: Fix build on newer versions of rust
  • Loading branch information
Marwes authored Sep 9, 2023
2 parents be67982 + 37b7ab9 commit 627c992
Show file tree
Hide file tree
Showing 29 changed files with 1,267 additions and 1,290 deletions.
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

0 comments on commit 627c992

Please sign in to comment.