summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-05-06 23:10:21 +0200
committerJan Ekström <jeebjp@gmail.com>2021-05-16 01:55:37 +0300
commit3010588d14c638815cac1f1c8386b062e0b40f33 (patch)
tree9edee4a5c0046e0ef71dc8b8b96944e26f9db88c
parent10d68d06e65a55a793de65f947c8383c54b68792 (diff)
downloadmpv-3010588d14c638815cac1f1c8386b062e0b40f33.tar.bz2
mpv-3010588d14c638815cac1f1c8386b062e0b40f33.tar.xz
build: move mingw jobs to Github actions
-rw-r--r--.github/workflows/build.yml41
-rw-r--r--.travis.yml21
2 files changed, 41 insertions, 21 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000000..306772c32e
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,41 @@
+name: build
+
+on:
+ push:
+ branches:
+ - master
+ - ci
+ - 'release/**'
+ pull_request:
+ branches: [master]
+
+jobs:
+ mingw:
+ runs-on: ubuntu-20.04
+ strategy:
+ matrix:
+ target: [i686-w64-mingw32, x86_64-w64-mingw32]
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: actions/cache@v2
+ with:
+ path: mingw_prefix/
+ key: ${{ matrix.target }}
+
+ - name: Install dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y autoconf automake pkg-config g++-mingw-w64 gcc-multilib nasm yasm
+ ./bootstrap.py
+
+ - name: Build
+ run: |
+ ./ci/build-mingw64.sh
+ env:
+ TARGET: ${{ matrix.target }}
+
+ - name: Print configure log
+ if: ${{ failure() }}
+ run: |
+ cat ./build/config.log
diff --git a/.travis.yml b/.travis.yml
index 0ab0e75f5e..cf5b11c67c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,23 +14,6 @@ _macbase:
- $HOME/Library/Caches/Homebrew
- /usr/local/Homebrew
-_mingwbase:
- - &mingw
- os: linux
- addons:
- apt:
- packages:
- - 'autoconf'
- - 'automake'
- - 'pkg-config'
- - 'gcc-mingw-w64'
- - 'gcc-multilib'
- - 'nasm'
- - 'yasm'
- cache:
- directories:
- - mingw_prefix/
-
matrix:
include:
- <<: *mac
@@ -51,10 +34,6 @@ matrix:
- os: linux
compiler: clang
env: CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh
- - <<: *mingw
- env: CI_SCRIPT=ci/build-mingw64.sh TARGET=i686-w64-mingw32
- - <<: *mingw
- env: CI_SCRIPT=ci/build-mingw64.sh TARGET=x86_64-w64-mingw32
allow_failures:
- os: osx
osx_image: xcode9.4