Skip to content

Commit 42dbd5e

Browse files
authored
Merge branch 'v2' into codex/backport-pr-2298-v2
2 parents b2e6145 + 58136d1 commit 42dbd5e

7 files changed

Lines changed: 19 additions & 36 deletions

File tree

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
],
77
"commit": false,
88
"access": "public",
9-
"baseBranch": "develop"
9+
"baseBranch": "v2"
1010
}

.changeset/strong-news-float.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [develop, beta]
5+
branches: [v2]
66
pull_request:
7-
branches: [develop, beta]
7+
branches: [v2]
88

99
jobs:
1010
build-and-test:
@@ -49,12 +49,10 @@ jobs:
4949
needs_lfs: ${{ matrix.needs_lfs }}
5050

5151
release:
52-
name: Release (latest or beta)
53-
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta'
52+
name: Release (v2)
53+
if: github.ref == 'refs/heads/v2'
5454
needs: [build-and-test]
5555
runs-on: ubuntu-latest
56-
outputs:
57-
published: ${{ steps.changesets.outputs.published }}
5856
steps:
5957
- uses: actions/checkout@v5
6058
- name: Setup Node.js environment
@@ -74,8 +72,7 @@ jobs:
7472
publish: npm run release
7573
title: "chore(new-release)"
7674
commit: "chore(new-release)"
77-
branch: ${{ github.ref == 'refs/heads/beta' && 'beta' || null }}
78-
createGithubReleases: ${{ github.ref == 'refs/heads/develop' }}
75+
createGithubReleases: true
7976
env:
8077
GITHUB_TOKEN: ${{ secrets.STACKS_TOOLING_GH_RW_PAT }}
8178
NPM_TOKEN: ${{ secrets.NPM_API_KEY }}
@@ -92,24 +89,6 @@ jobs:
9289
This is a technical user which does not trigger actions workflows on push events.
9390
See this GH issue for more details: https://github.com/changesets/action/issues/187
9491
95-
update-docs:
96-
name: Update main site stackoverflow.design
97-
if: ${{ needs.release.outputs.published == 'true' && github.ref == 'refs/heads/develop' }}
98-
needs: [build-and-test, release]
99-
runs-on: ubuntu-latest
100-
steps:
101-
- uses: actions/checkout@v5
102-
- name: 🔄 Update stackoverflow.design docs
103-
run: |
104-
git config --global user.name 'github-actions[bot]'
105-
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
106-
git fetch origin
107-
git checkout production
108-
git merge --no-ff --allow-unrelated-histories origin/develop -m "chore: merge develop into production"
109-
git push origin production
110-
env:
111-
GITHUB_TOKEN: ${{ secrets.STACKS_TOOLING_GH_RW_PAT }}
112-
11392
# cancel the jobs if another workflow is kicked off for the same branch
11493
concurrency:
11594
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
build-and-test:
2626
name: ${{ inputs.command_description }}
2727
runs-on: ubuntu-latest
28+
timeout-minutes: 30
2829
steps:
2930
- name: ⬇️ Checkout
3031
uses: actions/checkout@v4
@@ -34,7 +35,9 @@ jobs:
3435
- name: ⎔ Setup node
3536
uses: actions/setup-node@v4
3637
with:
37-
node-version: 'lts/*'
38+
# Pin exactly: Node 24.16.0 hangs `playwright install` while
39+
# extracting browsers; 24.15.0 is the last good version.
40+
node-version: '24.15.0'
3841

3942
- name: 🏗 Install Dependencies
4043
run: npm ci

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/stacks-svelte/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @stackoverflow/stacks-svelte
22

3+
## 0.6.1
4+
5+
### Patch Changes
6+
7+
- [#2206](https://github.com/StackExchange/Stacks/pull/2206) [`a9d6edf`](https://github.com/StackExchange/Stacks/commit/a9d6edf80a51869139b67e2047c56b057a3bad38) Thanks [@abovedave](https://github.com/abovedave)! - \* `<Avatar>` nested `<img>` dimensions.
8+
- Screen reader text for the private badge variant.
9+
310
## 0.6.0
411

512
### Minor Changes

packages/stacks-svelte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@stackoverflow/stacks-svelte",
33
"description": "Stacks Components built in Svelte",
44
"type": "module",
5-
"version": "0.6.0",
5+
"version": "0.6.1",
66
"exports": {
77
".": {
88
"types": "./lib/components/index.d.ts",

0 commit comments

Comments
 (0)