Skip to content

Commit 6e49dba

Browse files
author
KoLiBer
committed
fix(CI): merge request, release workflows into one CI/CD workflow
1 parent f5dca6e commit 6e49dba

File tree

3 files changed

+9
-46
lines changed

3 files changed

+9
-46
lines changed

.github/.releaserc.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ plugins:
99
- "@semantic-release/changelog"
1010
- "@semantic-release/npm"
1111
- - "@semantic-release/git"
12-
- message: "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
13-
assets:
12+
- assets:
1413
- CHANGELOG.md
1514
- package.json
1615
- package-lock.json
1716
- - "@saithodev/semantic-release-backmerge"
18-
- branchName: next
17+
- branches:
18+
- { from: "master", to: "next" }

.github/workflows/release.yml .github/workflows/cicd.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
name: Release
1+
name: CI/CD
22

33
on:
44
push:
55
branches:
66
- "+([0-9])?(.{+([0-9]),x}).x"
77
- master
88
- next
9+
pull_request:
10+
branches:
11+
- "+([0-9])?(.{+([0-9]),x}).x"
12+
- next
913

1014
jobs:
1115
build:
@@ -45,6 +49,7 @@ jobs:
4549
release:
4650
needs: test
4751
runs-on: ubuntu-latest
52+
if: github.event_name == 'push'
4853
steps:
4954
- uses: actions/checkout@v2
5055
- uses: actions/cache@v2

.github/workflows/request.yml

-42
This file was deleted.

0 commit comments

Comments
 (0)