From 4012659fd7ab7c2d08904e73797d1beba8515dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 28 Jun 2020 16:39:09 +0200 Subject: [PATCH 1/3] Cache the environment --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 12961de12..a01060c93 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -24,6 +24,7 @@ jobs: - uses: msys2/setup-msys2@v1 with: update: true + cache: true msystem: MINGW32 install: 'make mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686-libpng mingw-w64-i686-libvncserver' - uses: actions/checkout@v2 From 5d5b9598b2e60b239a4ddf70681c7d5a27a8cde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 28 Jun 2020 17:18:14 +0200 Subject: [PATCH 2/3] Jenkins test --- src/win/86Box.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 62031c373..1265799cf 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -8,8 +8,6 @@ * * Application resource script for Windows. * - * - * * Authors: Miran Grca, * Fred N. van Kempen, * David Hrdlička, From af26e19b83d48724c90d4db43efb7ecf1ec4d83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 28 Jun 2020 17:55:20 +0200 Subject: [PATCH 3/3] workflows: disable cache, build all branches --- .github/workflows/c-cpp.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a01060c93..e9c8d3013 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -1,10 +1,16 @@ name: C/C++ CI on: + push: - branches: [ master ] + paths: + - src/** + - .github/workflows/** + pull_request: - branches: [ master ] + paths: + - src/** + - .github/workflows/** jobs: build: @@ -24,7 +30,6 @@ jobs: - uses: msys2/setup-msys2@v1 with: update: true - cache: true msystem: MINGW32 install: 'make mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686-libpng mingw-w64-i686-libvncserver' - uses: actions/checkout@v2