Skip to content
This repository has been archived by the owner on Dec 23, 2024. It is now read-only.

Commit

Permalink
Add workflow for merging release/minor branch to
Browse files Browse the repository at this point in the history
master
  • Loading branch information
monstajoe2002 committed Dec 2, 2023
1 parent 88ed7c5 commit bd158f4
Showing 1 changed file with 38 additions and 0 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
on:
push:
branches:
- release/minor

jobs:
merge:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Configure Git
run: |
git config --global user.email "[email protected]"
git config --global user.name "monstajoe2002"
- name: Merge to master
run: |
git checkout master
git merge --no-ff release/minor
git push origin master
build:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
- run: npm install
- run: xvfb-run -a npm test
if: runner.os == 'Linux'
- run: npm test
if: runner.os != 'Linux'

0 comments on commit bd158f4

Please sign in to comment.