From 5df77281795aee81a7953947fcac617e52ed7ddc Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 18:31:02 -0500 Subject: [PATCH 1/7] switched check source to root directory --- .github/workflows/ruff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 92a865195..4955519ac 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -12,4 +12,4 @@ jobs: steps: - uses: astral-sh/ruff-action@v2 with: - args: "format --check" + args: "format --check ." From 9049a9b87c99d0824f03070d0f0febc903255d7d Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:34:11 -0600 Subject: [PATCH 2/7] Ruff now checks out code and uses the workspace --- .github/workflows/ruff.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 4955519ac..76058988b 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -10,6 +10,11 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: astral-sh/ruff-action@v2 + - name: Checkout code + uses: actions/checkout@v2 + + - name: Run Ruff format checking + uses: astral-sh/ruff-action@v2 with: args: "format --check ." + working-directory: ${{ github.workspace }} From cc2f3914b91e154802696fd5a4d2b8f83940d2f8 Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:38:04 -0600 Subject: [PATCH 3/7] removed work dir, switched to src arg --- .github/workflows/ruff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 76058988b..e16b502bc 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -17,4 +17,4 @@ jobs: uses: astral-sh/ruff-action@v2 with: args: "format --check ." - working-directory: ${{ github.workspace }} + src: "./simopt" From 0aa4ba3b78038f8f58721169f49cae2735421c8b Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:38:41 -0600 Subject: [PATCH 4/7] removed checkout --- .github/workflows/ruff.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index e16b502bc..6482724d8 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -10,9 +10,6 @@ jobs: lint: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Run Ruff format checking uses: astral-sh/ruff-action@v2 with: From ac4b0f842edde3d4109f52cd1db0263a35eb692e Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:44:11 -0600 Subject: [PATCH 5/7] added back checkout code step --- .github/workflows/ruff.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 6482724d8..310e2af6a 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -10,8 +10,11 @@ jobs: lint: runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Run Ruff format checking uses: astral-sh/ruff-action@v2 with: - args: "format --check ." + args: "format --check" src: "./simopt" From 073d734d206b0eb873b2c6a0f4565832d8661b14 Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:49:06 -0600 Subject: [PATCH 6/7] added dev branch to ruff check list --- .github/workflows/ruff.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 310e2af6a..3f9547c96 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -2,9 +2,9 @@ name: "ruff format checking" on: push: - branches: [ "master" ] + branches: [ "master", "development" ] pull_request: - branches: [ "master" ] + branches: [ "master" , "development" ] jobs: lint: @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - + - name: Run Ruff format checking uses: astral-sh/ruff-action@v2 with: From c657235e14c4dae8baa5415ee3c8f7cd92b30686 Mon Sep 17 00:00:00 2001 From: William Grochocinski Date: Thu, 26 Dec 2024 17:56:59 -0600 Subject: [PATCH 7/7] added code check --- .github/workflows/ruff.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 3f9547c96..a78c8e6e9 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -1,4 +1,4 @@ -name: "ruff format checking" +name: "Ruff CI" on: push: @@ -7,14 +7,24 @@ on: branches: [ "master" , "development" ] jobs: - lint: + linter: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 - - name: Run Ruff format checking + - name: Ruff linting check + uses: astral-sh/ruff-action@v2 + with: + args: "check --no-fix" + + formatter: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Ruff formatting check uses: astral-sh/ruff-action@v2 with: args: "format --check" - src: "./simopt"