Skip to content

Commit

Permalink
Merge branch 'master' into tgf/test-new-FFMPEG
Browse files Browse the repository at this point in the history
  • Loading branch information
theogf authored Dec 23, 2024
2 parents 3bedf4b + 37e4adb commit 30bb016
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
matrix:
os:
- ubuntu-latest
- macOS-13 # intel
- macOS-14 # arm
- windows-latest
julia-arch:
Expand All @@ -29,16 +28,12 @@ jobs:
julia-version:
- '1.6'
- '1'
- 'nightly'
- 'pre'
exclude:
- os: ubuntu-latest
julia-arch: aarch64
- os: windows-latest
julia-arch: aarch64
- os: macOS-13
julia-arch: x86
- os: macOS-13
julia-arch: aarch64
- os: macOS-14
julia-arch: x86
- os: macOS-14
Expand All @@ -48,10 +43,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- name: Configure new FFMPEG version environment
shell: julia --project="." --color=yes {0}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: 1
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeformat-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: 1
- name: Install JuliaFormatter and format
run: julia -e 'import Pkg; Pkg.add("JuliaFormatter"); using JuliaFormatter; format(["docs", "gen", "src", "test", "util"])'
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.DOCUMENTER_KEY }}
commit-message: Format files using JuliaFormatter
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "VideoIO"
uuid = "d6d074c3-1acf-5d4c-9a43-ef38773959a2"
version = "1.1.0"
version = "1.1.1"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Expand All @@ -15,7 +15,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Scratch = "6c6a2e73-6563-6170-7368-637461726353"

[compat]
ColorTypes = "0.9, 0.10, 0.11"
ColorTypes = "0.9, 0.10, 0.11, 0.12"
Downloads = "1.3"
FFMPEG = "0.3, 0.4, 1"
FFMPEG_jll = "6.1"
Expand Down

0 comments on commit 30bb016

Please sign in to comment.