Skip to content

Commit 706ca5e

Browse files
committed
Merge branch 'feat/disallow-debug-format' of github.com:input-output-hk/catalyst-ci into feat/disallow-debug-format
2 parents 47a73fc + 4c25eff commit 706ca5e

File tree

6 files changed

+40
-7
lines changed

6 files changed

+40
-7
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Validate Own Project Fields
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
- reopened
10+
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
id-token: write
15+
repository-projects: write
16+
17+
jobs:
18+
validate-own-fields:
19+
uses: ./.github/workflows/validate-project-fields.yml
20+
secrets: inherit

.github/workflows/validate-project-fields.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: Validate Project Fields
22

33
on:
4+
workflow_call:
5+
inputs:
6+
project_number:
7+
description: "Project number to validate"
8+
required: false
9+
type: string
10+
default: "102"
411
pull_request:
512
types:
613
- opened
@@ -27,7 +34,7 @@ jobs:
2734
GITHUB_PROJECTS_PAT: ${{ secrets.PROJECTS_PAT }}
2835
GITHUB_REPOSITORY: "${{ github.repository }}"
2936
GITHUB_EVENT_NUMBER: "${{ github.event.number || '0' }}"
30-
PROJECT_NUMBER: 102
37+
PROJECT_NUMBER: ${{ inputs.project_number || '102' }}
3138
steps:
3239
- name: Fetch Validation Script
3340
uses: actions/checkout@v4

earthly/rust/stdcfgs/rustfmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ match_block_trailing_comma = true
3535
max_width = 100
3636

3737
# Comments:
38-
normalize_comments = true
38+
normalize_comments = false
3939
normalize_doc_attributes = false
4040
wrap_comments = true
4141
comment_width = 90 # small excess is okay but prefer 80
@@ -51,7 +51,7 @@ imports_granularity = "Crate"
5151

5252
# Arguments:
5353
use_small_heuristics = "Default"
54-
fn_params_layout = "Compressed"
54+
fn_params_layout = "Vertical"
5555
overflow_delimited_expr = true
5656
where_single_line = true
5757

examples/rust/crates/bar/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
33
/// Adds two numbers
44
#[must_use]
5-
pub fn add(left: usize, right: usize) -> usize {
5+
pub fn add(
6+
left: usize,
7+
right: usize,
8+
) -> usize {
69
left.saturating_add(right)
710
}
811

examples/rust/crates/foo/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
33
/// Format our hello message nicely.
44
#[must_use]
5-
pub fn fmt_hello(name: &str, count: u8) -> String {
5+
pub fn fmt_hello(
6+
name: &str,
7+
count: u8,
8+
) -> String {
69
format!("Hello #{count:>3} {name}!")
710
}
811

examples/rust/rustfmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ match_block_trailing_comma = true
3535
max_width = 100
3636

3737
# Comments:
38-
normalize_comments = true
38+
normalize_comments = false
3939
normalize_doc_attributes = false
4040
wrap_comments = true
4141
comment_width = 90 # small excess is okay but prefer 80
@@ -51,7 +51,7 @@ imports_granularity = "Crate"
5151

5252
# Arguments:
5353
use_small_heuristics = "Default"
54-
fn_params_layout = "Compressed"
54+
fn_params_layout = "Vertical"
5555
overflow_delimited_expr = true
5656
where_single_line = true
5757

0 commit comments

Comments
 (0)