Skip to content

Commit 550eb0c

Browse files
authored
Merge branch 'main' into primer_border_update
2 parents 3d8e6e5 + 22e67a6 commit 550eb0c

File tree

8 files changed

+230
-381
lines changed

8 files changed

+230
-381
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@ updates:
1010
- package-ecosystem: "github-actions"
1111
directory: "/"
1212
schedule:
13-
interval: "monthly"
13+
interval: "daily"
14+
groups:
15+
all-actions:
16+
patterns:
17+
- "*"
1418

1519
# Maintain dependencies for npm
1620
- package-ecosystem: "npm"
1721
directory: "/"
1822
schedule:
19-
interval: "monthly"
23+
interval: "daily"
24+
groups:
25+
production-dependencies:
26+
dependency-type: "production"
27+
development-dependencies:
28+
dependency-type: "development"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: actions/setup-node@v3
12+
- uses: actions/setup-node@v4
1313
- run: npm ci
1414
- run: npm run test
1515
lint:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: actions/setup-node@v3
19+
- uses: actions/setup-node@v4
2020
- run: npm ci
2121
- run: npm run lint

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
persist-credentials: false
1919

2020
- name: Set up Node.js
21-
uses: actions/setup-node@v3
21+
uses: actions/setup-node@v4
2222

2323
- name: Install dependencies
2424
run: npm ci && npm run build

.github/workflows/release_canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
release-canary:
1111
name: npm
1212
if: ${{ github.repository == 'primer/stylelint-config' }}
13-
uses: primer/.github/.github/workflows/release_canary.yml@v2.0.1
13+
uses: primer/.github/.github/workflows/release_canary.yml@v2.1.0
1414
with:
1515
install: npm i
1616
secrets:

.github/workflows/release_candidate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 0
1919

2020
- name: Set up Node.js
21-
uses: actions/setup-node@v3
21+
uses: actions/setup-node@v4
2222

2323
- name: Install dependencies
2424
run: npm ci && npm run build
@@ -40,7 +40,7 @@ jobs:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141

4242
- name: Output candidate version number
43-
uses: actions/github-script@v6
43+
uses: actions/github-script@v7
4444
with:
4545
script: |
4646
const package = require(`${process.env.GITHUB_WORKSPACE}/package.json`)

.github/workflows/release_tracking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ on:
1414
jobs:
1515
release-tracking:
1616
name: Release Tracking
17-
uses: primer/.github/.github/workflows/release_tracking.yml@create_release_tracking_workflow
17+
uses: primer/.github/.github/workflows/release_tracking.yml@v2.1.0
1818
secrets:
1919
datadog_api_key: ${{ secrets.DATADOG_API_KEY }}

__tests__/__fixtures__/good/example.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
width: var(--container-size);
129129
height: var(--container-size);
130130
/* stylelint-disable-next-line primer/spacing */
131-
padding: var(--space-xsmall);
131+
padding: var(--mySpace-xsmall);
132132
}
133133

134134
.marketplace-logo--large {
@@ -149,4 +149,4 @@
149149
&:not([open]) .up-icon {
150150
display: none !important;
151151
}
152-
}
152+
}

0 commit comments

Comments
 (0)