Skip to content

Commit 0987a8b

Browse files
authored
Merge pull request #291 from jepperaskdk/master
Added merge workflow for pull-requests with master as destination
2 parents d5bb246 + 02bd41e commit 0987a8b

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

.github/workflows/merge.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Merge checks
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
strategy:
13+
matrix:
14+
node-version: [12.x]
15+
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
24+
- name: Build
25+
run: |
26+
npm install
27+
npm run build
28+
29+
- name: Get version
30+
run: echo "::set-output name=version::v$(./ci/getVersion.sh)"
31+
id: version
32+
33+
- name: Verify version
34+
run: |
35+
./ci/verifyVersion.sh ${{ steps.version.outputs.version }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adminator",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"private": true,
55
"description": "HTML Admin Template",
66
"scripts": {

0 commit comments

Comments
 (0)