Skip to content

Commit 583da4e

Browse files
committed
workflows
1 parent b92bc24 commit 583da4e

File tree

5 files changed

+19
-32
lines changed

5 files changed

+19
-32
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: |
2020
github.event_name == 'workflow_dispatch' ||
2121
github.event_name == 'workflow_call' ||
22-
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
22+
(github.event_name == 'push' && github.ref == 'refs/heads/master') ||
2323
(github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
2424
steps:
2525
- name: Checkout

.github/workflows/release-new-version.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@ on:
1616
- "packages/daisyui/**"
1717

1818
jobs:
19+
run-tests:
20+
name: 🧪 Tests
21+
uses: ./.github/workflows/run-tests.yml
22+
secrets: inherit
23+
with:
24+
filter: ""
25+
1926
build-publish:
2027
name: 🔨 Build + 🚀 Publish
28+
needs: run-tests
2129
timeout-minutes: 10
2230
runs-on: ubuntu-latest
23-
outputs:
24-
daisyuiversion: ${{ steps.package-version.outputs.version }}
2531
steps:
2632
- name: Checkout
2733
uses: actions/checkout@v4
@@ -45,12 +51,6 @@ jobs:
4551
cd packages/daisyui
4652
bunx commit-and-tag-version --infile ../../CHANGELOG.md ${{ inputs.release-type }}
4753
48-
- name: Read package version from package.json
49-
id: package-version
50-
run: |
51-
version=$(grep -o '"version": *"[^"]*"' packages/daisyui/package.json | cut -d'"' -f4)
52-
echo version=$version >> $GITHUB_OUTPUT
53-
5454
- name: Push changes
5555
uses: ad-m/github-push-action@master
5656
with:
@@ -72,18 +72,8 @@ jobs:
7272
uses: ./.github/workflows/deploy-docs.yml
7373
secrets: inherit
7474

75-
run-tests:
76-
name: 🧪 Tests
77-
needs: build-publish
78-
uses: ./.github/workflows/run-tests.yml
79-
secrets: inherit
80-
with:
81-
filter: ""
82-
8375
write-release-notes:
8476
name: 📝 Release notes
85-
needs: build-publish
77+
needs: deploy-docs
8678
uses: ./.github/workflows/write-release-notes.yml
8779
secrets: inherit
88-
with:
89-
daisyuiversion: ${{ needs.build-publish.outputs.daisyuiversion }}

.github/workflows/run-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ on:
1111
inputs:
1212
filter:
1313
type: string
14-
# push:
15-
# branches:
16-
# - master
17-
# paths:
18-
# - "packages/daisyui/functions/**"
19-
# - "packages/daisyui/src/**"
20-
# - "packages/docs/src/**"
14+
push:
15+
branches:
16+
- master
17+
paths:
18+
- "packages/daisyui/functions/**"
19+
- "packages/daisyui/src/**"
20+
- "packages/docs/src/**"
2121
jobs:
2222
tests:
2323
timeout-minutes: 10

.github/workflows/write-release-notes.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: "📝 write release notes"
22

33
on:
44
workflow_call:
5-
inputs:
6-
daisyuiversion:
7-
type: string
85

96
jobs:
107
write-release-notes:
@@ -32,7 +29,7 @@ jobs:
3229
- name: Read package version from package.json
3330
id: package-version
3431
run: |
35-
version=${{ inputs.daisyuiversion }}
32+
version=$(grep -o '"version": *"[^"]*"' packages/daisyui/package.json | cut -d'"' -f4)
3633
echo version=$version >> $GITHUB_OUTPUT
3734
if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
3835
echo $version is a stable version

packages/daisyui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "module",
33
"name": "daisyui",
4-
"version": "5.0.7-experimental-1",
4+
"version": "5.0.7-experimental-2",
55
"description": "daisyUI 5 - Tailwind CSS Component Library",
66
"author": "Pouya Saadeghi",
77
"license": "MIT",

0 commit comments

Comments
 (0)