Skip to content

Commit

Permalink
Merge pull request #291 from jepperaskdk/master
Browse files Browse the repository at this point in the history
Added merge workflow for pull-requests with master as destination
  • Loading branch information
jepperaskdk authored Aug 26, 2022
2 parents d5bb246 + 02bd41e commit 0987a8b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Merge checks

on:
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build
run: |
npm install
npm run build
- name: Get version
run: echo "::set-output name=version::v$(./ci/getVersion.sh)"
id: version

- name: Verify version
run: |
./ci/verifyVersion.sh ${{ steps.version.outputs.version }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adminator",
"version": "2.0.1",
"version": "2.0.2",
"private": true,
"description": "HTML Admin Template",
"scripts": {
Expand Down

0 comments on commit 0987a8b

Please sign in to comment.