From fac543bf5a0e0afc4deaf9451c1472c5bb5281d0 Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Sun, 12 Nov 2023 17:30:49 +0100 Subject: [PATCH 1/2] bump actions version - bump checkout to @v4 - bump rust-toolchain to @v1 --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/rust-clippy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b192a3c..2fa8343 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Clone spacebar server run: | git clone https://github.com/bitfl0wer/server.git diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml index 0c3840f..560fd4e 100644 --- a/.github/workflows/rust-clippy.yml +++ b/.github/workflows/rust-clippy.yml @@ -26,10 +26,10 @@ jobs: actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Rust toolchain - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1 + uses: actions-rs/toolchain@v1 with: profile: minimal toolchain: stable From 2edab4cc994ecb649db3cde8de1d8941c1fd48f7 Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Sun, 12 Nov 2023 17:32:57 +0100 Subject: [PATCH 2/2] include "dev" branch in actions executions --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/rust-clippy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2fa8343..31962c2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -4,7 +4,7 @@ on: push: branches: [ "main", "dev" ] pull_request: - branches: [ "main" ] + branches: [ "main", "dev" ] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml index 560fd4e..15dedd4 100644 --- a/.github/workflows/rust-clippy.yml +++ b/.github/workflows/rust-clippy.yml @@ -14,7 +14,7 @@ on: branches: [ "main", "preserve/*", "dev" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "main" ] + branches: [ "main", "dev" ] jobs: rust-clippy-analyze: