chore: Add merge-group on workflow dispatch (#5872)

This commit is contained in:
Filipe Freire 2023-03-31 11:51:31 +01:00 committed by GitHub
parent 5322001ab0
commit d3b917a15f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions

View File

@ -1,6 +1,7 @@
name: Release Recurring name: Release Recurring
# This workflow bakes executables of the major platforms for Testing purposes # This workflow bakes executables of the major platforms for Testing purposes
on: on:
merge_group:
workflow_dispatch: workflow_dispatch:
push: push:
branches: branches:
@ -10,8 +11,8 @@ on:
- opened - opened
- synchronize - synchronize
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
env: env:
PR_NUMBER: ${{ github.event.number }} PR_NUMBER: ${{ github.event.number }}
jobs: jobs:
@ -23,12 +24,12 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- os: "macos-latest" - os: "macos-latest"
build-targets: "zip" build-targets: "zip"
- os: "windows-latest" - os: "windows-latest"
build-targets: "portable" build-targets: "portable"
- os: "ubuntu-latest" - os: "ubuntu-latest"
build-targets: "tar.gz" build-targets: "tar.gz"
steps: steps:
- name: Checkout branch - name: Checkout branch
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -36,7 +37,7 @@ jobs:
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version-file: '.nvmrc' node-version-file: ".nvmrc"
- name: Bootstrap packages - name: Bootstrap packages
run: npm run bootstrap run: npm run bootstrap

View File

@ -1,6 +1,7 @@
name: Test name: Test
on: on:
merge_group:
workflow_dispatch: workflow_dispatch:
push: push:
branches: branches:
@ -28,7 +29,7 @@ jobs:
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version-file: '.nvmrc' node-version-file: ".nvmrc"
- name: Bootstrap packages - name: Bootstrap packages
run: npm run bootstrap run: npm run bootstrap
@ -50,7 +51,7 @@ jobs:
- name: Build app for smoke tests - name: Build app for smoke tests
env: env:
NODE_OPTIONS: '--max_old_space_size=6144' NODE_OPTIONS: "--max_old_space_size=6144"
run: npm run app-build run: npm run app-build
- name: Run Smoke tests (CI) - name: Run Smoke tests (CI)