diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc0efb7e..b1984e9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,8 +4,8 @@ on:
push:
paths-ignore:
- '*.md'
- pull_request:
- branches: [ master ]
+# pull_request:
+# branches: [ master ]
jobs:
build-linux:
@@ -37,7 +37,7 @@ jobs:
build-macos:
name: build in native macOS
- runs-on: macos-10.15
+ runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
@@ -57,94 +57,114 @@ jobs:
run: |
./build-ffmpeg --cleanup
- build-docker:
- name: build in docker
- runs-on: ubuntu-20.04
+ build-windows:
+ name: build in native Windows
+ runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- - name: pull base image
- id: ubuntu_pull
- run: |
- docker pull ubuntu:20.04
- - name: run if ubuntu_pull failed
- if: failure() && steps.ubuntu_pull.outcome == 'failure'
- run: |
- docker pull ubuntu:20.04
- name: build ffmpeg
- run: |
- docker build -t ffmpeg:ubuntu -f Dockerfile .
+ shell: /bin/bash
+ run: ./build-ffmpeg --build
+ env:
+ SKIPINSTALL: 'yes'
+ VERBOSE: 'yes'
- name: test run ffmepg
run: |
- docker run --rm ffmpeg:ubuntu -buildconf
-
- build-cuda-ubuntu-docker:
- name: build in ubuntu docker with cuda
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: pull base image
- id: cuda_ubuntu_pull
- run: |
- docker pull nvidia/cuda:11.1-devel-ubuntu20.04
- docker pull ubuntu:20.04
- - name: run if cuda_ubuntu_pull failed
- if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
- run: |
- docker pull nvidia/cuda:11.1-devel-ubuntu20.04
- docker pull ubuntu:20.04
- - name: build ffmpeg
- run: |
- docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
- - name: test run ffmepg
- run: |
- docker run --rm ffmpeg:cuda-ubuntu -buildconf
-
- build-cuda-centos-docker:
- name: build in centos docker with cuda
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: pull base image
- id: cuda_centos_pull
- run: |
- docker pull nvidia/cuda:11.1-devel-centos8
- docker pull centos:8
- - name: run if cuda_centos_pull failed
- if: failure() && steps.cuda_centos_pull.outcome == 'failure'
- run: |
- docker pull nvidia/cuda:11.1-devel-centos8
- docker pull centos:8
- - name: build ffmpeg
- run: |
- docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
- - name: test run ffmepg
+ ./workspace/bin/ffmpeg -buildconf
+ - name: clean up
run: |
- docker run --rm ffmpeg:cuda-centos -buildconf
-
- build-full-static:
- name: full static build in docker
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
+ ./build-ffmpeg --cleanup
- - name: pull base image
- id: cuda_ubuntu_pull
- run: |
- docker pull nvidia/cuda:11.1-devel-ubuntu20.04
- - name: run if cuda_ubuntu_pull failed
- if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
- run: |
- docker pull nvidia/cuda:11.1-devel-ubuntu20.04
- - name: build ffmpeg
- run: |
- docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
- - name: test run ffmepg
- run: |
- docker run --rm ffmpeg:cuda-static -buildconf
\ No newline at end of file
+# build-docker:
+# name: build in docker
+# runs-on: ubuntu-20.04
+# steps:
+# - name: Checkout code
+# uses: actions/checkout@v2
+#
+# - name: pull base image
+# id: ubuntu_pull
+# run: |
+# docker pull ubuntu:20.04
+# - name: run if ubuntu_pull failed
+# if: failure() && steps.ubuntu_pull.outcome == 'failure'
+# run: |
+# docker pull ubuntu:20.04
+# - name: build ffmpeg
+# run: |
+# docker build -t ffmpeg:ubuntu -f Dockerfile .
+# - name: test run ffmepg
+# run: |
+# docker run --rm ffmpeg:ubuntu -buildconf
+#
+# build-cuda-ubuntu-docker:
+# name: build in ubuntu docker with cuda
+# runs-on: ubuntu-20.04
+# steps:
+# - name: Checkout code
+# uses: actions/checkout@v2
+#
+# - name: pull base image
+# id: cuda_ubuntu_pull
+# run: |
+# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+# docker pull ubuntu:20.04
+# - name: run if cuda_ubuntu_pull failed
+# if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
+# run: |
+# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+# docker pull ubuntu:20.04
+# - name: build ffmpeg
+# run: |
+# docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
+# - name: test run ffmepg
+# run: |
+# docker run --rm ffmpeg:cuda-ubuntu -buildconf
+#
+# build-cuda-centos-docker:
+# name: build in centos docker with cuda
+# runs-on: ubuntu-20.04
+# steps:
+# - name: Checkout code
+# uses: actions/checkout@v2
+#
+# - name: pull base image
+# id: cuda_centos_pull
+# run: |
+# docker pull nvidia/cuda:11.1-devel-centos8
+# docker pull centos:8
+# - name: run if cuda_centos_pull failed
+# if: failure() && steps.cuda_centos_pull.outcome == 'failure'
+# run: |
+# docker pull nvidia/cuda:11.1-devel-centos8
+# docker pull centos:8
+# - name: build ffmpeg
+# run: |
+# docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
+# - name: test run ffmepg
+# run: |
+# docker run --rm ffmpeg:cuda-centos -buildconf
+#
+# build-full-static:
+# name: full static build in docker
+# runs-on: ubuntu-20.04
+# steps:
+# - name: Checkout code
+# uses: actions/checkout@v2
+#
+# - name: pull base image
+# id: cuda_ubuntu_pull
+# run: |
+# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+# - name: run if cuda_ubuntu_pull failed
+# if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
+# run: |
+# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+# - name: build ffmpeg
+# run: |
+# docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
+# - name: test run ffmepg
+# run: |
+# docker run --rm ffmpeg:cuda-static -buildconf