Skip to content

Commit

Permalink
resolved conflict from main
Browse files Browse the repository at this point in the history
  • Loading branch information
Vovke committed Sep 18, 2024
2 parents a5bb7ee + 6c039a9 commit e419cbd
Show file tree
Hide file tree
Showing 8 changed files with 381 additions and 400 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust-cargo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-cargo-deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout Sources
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Run cargo-deny
uses: EmbarkStudios/cargo-deny-action@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rust-check-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ jobs:
override: true

- name: Checkout base
uses: actions/[email protected].1
uses: actions/[email protected].2
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.base.ref }}
fetch-depth: 50
submodules: 'recursive'

- name: Checkout before push
uses: actions/[email protected].1
uses: actions/[email protected].2
if: github.event_name != 'pull_request'
with:
ref: ${{ github.event.before }}
Expand All @@ -53,7 +53,7 @@ jobs:
)" >> $GITHUB_ENV
- name: Checkout sources
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
Loading

0 comments on commit e419cbd

Please sign in to comment.