Skip to content

Commit

Permalink
Merge pull request #509 from jaytaph/gosub-508
Browse files Browse the repository at this point in the history
Added different platforms to matrix
  • Loading branch information
jaytaph committed Jul 3, 2024
2 parents 3276088 + 340b73a commit 3659fd7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 20 deletions.
File renamed without changes.
47 changes: 28 additions & 19 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
strategy:
fail-fast: false
matrix:
rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
rust_version: [ stable, nightly, 1.73.0 ]
os: [ ubuntu-latest ]
# rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
# os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -25,16 +28,16 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cargo/
key: ${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-
- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/work/gosub-engine/gosub-engine/target
key: ${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-
- name: Build
run: cargo build --verbose --all --all-features
- name: Clean
Expand All @@ -48,7 +51,10 @@ jobs:
strategy:
fail-fast: false
matrix:
rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
rust_version: [ stable, nightly, 1.73.0 ]
os: [ ubuntu-latest ]
# rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
# os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- name: Print CPU info
run: lscpu
Expand All @@ -60,16 +66,16 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-
- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/work/gosub-engine/gosub-engine/target
key: ${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-
- name: Run tests
run: cargo test --verbose --all --no-fail-fast --all-features --all-targets

Expand All @@ -78,7 +84,10 @@ jobs:
strategy:
fail-fast: false
matrix:
rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
rust_version: [ stable, nightly ]
os: [ ubuntu-latest ]
# rust_version: [ stable, beta, nightly, 1.73.0, "stable minus 1 release", "stable minus 2 releases" ]
# os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -88,16 +97,16 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-registry-${{ matrix.rust_version }}-
- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/work/gosub-engine/gosub-engine/target
key: ${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
key: ${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-
${{ matrix.os }}-cargo-target-${{ matrix.rust_version }}-
- name: Run Clippy
run: cargo clippy --all --tests -- -D warnings

Expand All @@ -114,7 +123,7 @@ jobs:
restore-keys: |
${{ runner.os }}-cargo-registry-${{ matrix.rust_version }}-
- name: Cache cargo build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/work/gosub-engine/gosub-engine/target
key: ${{ runner.os }}-cargo-target-${{ matrix.rust_version }}-${{ hashFiles('**/Cargo.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-author-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
sh .github/workflows/check_authors.sh ${{ env.PR_FETCH_DEPTH }} || exit_status=$?
echo "found=${exit_status:-0}" >> $GITHUB_OUTPUT
- name: Find Comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
id: fc
with:
issue-number: ${{ github.event.pull_request.number }}
Expand Down

0 comments on commit 3659fd7

Please sign in to comment.