robin/purpledot
1
0
Fork 0
mirror of https://github.com/icewind1991/purpledot.git synced 2026-06-03 17:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

ci bumps

Browse source
This commit is contained in:
Robin Appelman 2023-08-05 18:46:51 +02:00
commit f49b782973
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.github/workflows/ci.yml vendored
View file

@ -4,15 +4,13 @@ on: [ push, pull_request ]
jobs: jobs:
build-linux: build-linux:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
profile: minimal
toolchain: stable toolchain: stable
override: true - uses: Swatinem/rust-cache@v2
- uses: Swatinem/rust-cache@v1
# https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu # https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu
- name: Install FFmpegBuildTools - name: Install FFmpegBuildTools
@ -49,7 +47,7 @@ jobs:
- name: Cache ffmpeg - name: Cache ffmpeg
id: cache-ffmpeg id: cache-ffmpeg
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ~/ffmpeg_build path: ~/ffmpeg_build
key: ${{ runner.os }}-ffmpeg key: ${{ runner.os }}-ffmpeg
@ -70,20 +68,18 @@ jobs:
FFMPEG_INCLUDE_DIR=${HOME}/ffmpeg_build/include \ FFMPEG_INCLUDE_DIR=${HOME}/ffmpeg_build/include \
FFMPEG_PKG_CONFIG_PATH=${HOME}/ffmpeg_build/lib/pkgconfig \ FFMPEG_PKG_CONFIG_PATH=${HOME}/ffmpeg_build/lib/pkgconfig \
cargo build --release --locked cargo build --release --locked
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: purpledot name: purpledot
path: target/release/purpledot path: target/release/purpledot
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
profile: minimal
toolchain: stable toolchain: stable
override: true - uses: Swatinem/rust-cache@v2
- uses: Swatinem/rust-cache@v1
# Using this since it's used by clang-sys's CI # Using this since it's used by clang-sys's CI
- name: Install LLVM and Clang - name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1 uses: KyleMayes/install-llvm-action@v1
@ -93,7 +89,7 @@ jobs:
- name: Cache vcpkg - name: Cache vcpkg
id: cache-vcpkg id: cache-vcpkg
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: vcpkg path: vcpkg
key: ${{ runner.os }}-vcpkg key: ${{ runner.os }}-vcpkg
@ -103,9 +99,7 @@ jobs:
run: | run: |
git clone https://github.com/microsoft/vcpkg -b 2023.07.21 --single-branch --depth 1 git clone https://github.com/microsoft/vcpkg -b 2023.07.21 --single-branch --depth 1
./vcpkg/bootstrap-vcpkg.bat ./vcpkg/bootstrap-vcpkg.bat
cp ${{ github.workspace }}/vcpkg.json ./vcpkg/ ./vcpkg/vcpkg.exe install ffmpeg:x64-windows-static --triplet x86-windows
./vcpkg/vcpkg x-update-baseline --add-initial-baseline
./vcpkg/vcpkg.exe install
- name: Build - name: Build
env: env:
@ -113,7 +107,7 @@ jobs:
LIBCLANG_PATH: ${{ github.workspace }}/clang/lib LIBCLANG_PATH: ${{ github.workspace }}/clang/lib
LLVM_CONFIG_PATH: ${{ github.workspace }}/clang/bin/llvm-config LLVM_CONFIG_PATH: ${{ github.workspace }}/clang/bin/llvm-config
run: cargo build --release --locked run: cargo build --release --locked
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: purpledot.exe name: purpledot.exe
path: target/release/purpledot.exe path: target/release/purpledot.exe

9
vcpkg.json
View file

@ -1,9 +0,0 @@
{
"dependencies": [
"ffmpeg:x64-windows-static",
],
"builtin-baseline": "9d47b24eacbd1cd94f139457ef6cd35e5d92cc84",
"overrides": [
{ "name": "ffmpeg:x64-windows-static", "version": "5.1.2" }
]
}