From b30e56fd12baf4d506d57d147b988471944b3af4 Mon Sep 17 00:00:00 2001 From: Wengier Date: Sat, 28 May 2022 00:04:24 -0400 Subject: [PATCH] update workflows --- .github/workflows/hxdos.yml | 12 ++++++------ .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mingw32.yml | 2 +- .github/workflows/mingw64.yml | 2 +- .github/workflows/vsbuild32.yml | 4 ++-- .github/workflows/vsbuild64.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/hxdos.yml b/.github/workflows/hxdos.yml index 758bc6814..759ebe983 100644 --- a/.github/workflows/hxdos.yml +++ b/.github/workflows/hxdos.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: @@ -37,8 +37,8 @@ jobs: copy build-scripts\mingw\bin\msys.bat mingw-get\msys\1.0 copy build-scripts\mingw\bin\runbuild.sh mingw-get\msys\1.0 copy build-scripts\mingw\bin\gawk.exe mingw-get\msys\1.0\bin - rem mingw-get\msys\1.0\msys.bat /mingw/msys/1.0/runbuild.sh build-mingw-hx-dos - if (-not(Test-Path -Path $top/src/dosbox-x.exe -PathType Leaf)) {exit 1} + mingw-get\msys\1.0\msys.bat /mingw/msys/1.0/runbuild.sh build-mingw-hx-dos + if (-not(Test-Path -Path src\dosbox-x.exe -PathType Leaf)) {exit 1} - name: Package HX-DOS shell: bash run: | @@ -65,7 +65,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: @@ -94,8 +94,8 @@ jobs: - name: Build MinGW lowend shell: pwsh run: | - rem mingw-get\msys\1.0\msys.bat /mingw/msys/1.0/runbuild.sh build-mingw-lowend - if (-not(Test-Path -Path $top/src/dosbox-x.exe -PathType Leaf)) {exit 1} + mingw-get\msys\1.0\msys.bat /mingw/msys/1.0/runbuild.sh build-mingw-lowend + if (-not(Test-Path -Path src\dosbox-x.exe -PathType Leaf)) {exit 1} - name: Package MinGW lowend run: | top=`pwd` diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8ba793fef..d71178b76 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - name: Cancel previous runs diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3c2c95f67..c6d3589ba 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: macos-latest steps: - name: Cancel previous runs diff --git a/.github/workflows/mingw32.yml b/.github/workflows/mingw32.yml index 1827f34a2..dfec905b3 100644 --- a/.github/workflows/mingw32.yml +++ b/.github/workflows/mingw32.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml index f1df5bd5b..ff5d8a1be 100644 --- a/.github/workflows/mingw64.yml +++ b/.github/workflows/mingw64.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: diff --git a/.github/workflows/vsbuild32.yml b/.github/workflows/vsbuild32.yml index ea6c252a5..632bc1c16 100644 --- a/.github/workflows/vsbuild32.yml +++ b/.github/workflows/vsbuild32.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: @@ -94,7 +94,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false runs-on: windows-latest defaults: run: diff --git a/.github/workflows/vsbuild64.yml b/.github/workflows/vsbuild64.yml index 8bf8932b6..1c8b29f69 100644 --- a/.github/workflows/vsbuild64.yml +++ b/.github/workflows/vsbuild64.yml @@ -11,7 +11,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' runs-on: windows-latest defaults: run: @@ -94,7 +94,7 @@ jobs: permissions: actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows contents: read # for actions/checkout to fetch code - if: github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false + if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || contains('joncampbell123', github.actor) == false runs-on: windows-latest defaults: run: