Skip to content

Commit

Permalink
build: Rebase on upstream/main
Browse files Browse the repository at this point in the history
  • Loading branch information
CHiPs44 committed Oct 31, 2023
2 parents 0d7fe30 + 0f5c7bc commit d67bd34
Show file tree
Hide file tree
Showing 20 changed files with 392 additions and 798 deletions.
57 changes: 0 additions & 57 deletions .cargo-husky/hooks/commit-msg

This file was deleted.

17 changes: 0 additions & 17 deletions .cargo-husky/hooks/pre-push

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/install-linuxbrew/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Installs Linuxbrew and updates apt-get with build-essentials
runs:
using: "composite"
steps:
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
- name: Cache Linuxbrew
uses: actions/cache@v3
with:
Expand Down
16 changes: 16 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
pull_request_rules:
- name: Merge Dependabot PRs
conditions:
- author=dependabot[bot]
actions:
merge:
method: squash
- name: Update PRs to latest main
conditions:
- -conflict
- -draft
- -author=dependabot[bot]
- -head~=release-plz-*
actions:
update:
29 changes: 29 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Continuous Deployment

# yamllint disable-line rule:truthy
on:
push:
branches: [main]

permissions:
pull-requests: write
contents: write

jobs:
cd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.RELEASE_PLZ_TOKEN }}
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: ./.github/actions/install-linuxbrew
- uses: ./.github/actions/install-sdl2
- name: Run release
uses: MarcoIeni/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
22 changes: 9 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,28 @@ jobs:
name: Check format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/cargo@v1
- uses: actions/checkout@v4
with:
command: fmt
args: --all -- --check
fetch-depth: 0
- run: cargo fmt --all --check

build-and-test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
toolchain: [stable, 1.62.0]
toolchain: [stable, 1.67.0]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: ${{ matrix.toolchain }}
override: true
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v2
- name: Lint
uses: actions-rs/cargo@v1
with:
command: clippy
- run: cargo clippy
- uses: ./.github/actions/install-linuxbrew
if: matrix.os == 'ubuntu-latest'
- uses: ./.github/actions/install-sdl2
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ jobs:
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: dtolnay/rust-toolchain@nightly
with:
profile: minimal
toolchain: nightly
override: true
components: llvm-tools-preview
- uses: Swatinem/rust-cache@v2
- uses: ./.github/actions/install-linuxbrew
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/outdated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
name: Outdated
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: dtolnay/install@cargo-outdated
- run: cargo outdated --exit-code 1
24 changes: 0 additions & 24 deletions .github/workflows/publish.yml

This file was deleted.

Loading

0 comments on commit d67bd34

Please sign in to comment.