From bd158f4120bf5cf00769b083b963efac4a8110e9 Mon Sep 17 00:00:00 2001 From: Youssef Amr El-Shehaby Date: Sat, 2 Dec 2023 13:16:56 +0200 Subject: [PATCH] Add workflow for merging release/minor branch to master --- .github/workflows/publish.yml | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..de25dae --- /dev/null +++ b/.github/workflows/publish.yml @@ -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 "youssef.amr90@gmail.com" + 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' \ No newline at end of file