From 73575564892732aced56bfaee6455dd3d191c347 Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sat, 5 Apr 2025 15:43:42 +0200 Subject: [PATCH 1/4] Install ffmpeg via jas --- .github/workflows/check.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2e5067f..c88dc12 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -29,13 +29,16 @@ jobs: with: path: ~/.cache/typst key: typst - - run: cargo install --debug --git https://github.com/rikhuijzer/jas - - run: | - jas install --gh typst/typst@v0.13.1 \ - --sha 7d214bfeffc2e585dc422d1a09d2b144969421281e8c7f5d784b65fc69b5673f - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: sudo apt-get install -y ffmpeg + - run: cargo install --debug jas@0.2.0 + - run: > + jas install + --gh typst/typst@v0.13.1 + --sha 7d214bfeffc2e585dc422d1a09d2b144969421281e8c7f5d784b65fc69b5673f + --gh-token ${{ secrets.GITHUB_TOKEN }} + - run: > + jas install + --url https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-6.0.1-amd64-static.tar.xz + --sha 28268bf402f1083833ea269331587f60a242848880073be8016501d864bd07a5 - run: | echo "DEEPINFRA_KEY=${{ secrets.DEEPINFRA_KEY }}" > keys.env echo "ELEVENLABS_KEY=${{ secrets.ELEVENLABS_KEY }}" >> keys.env From 6871d335373a7ce7cff529a004c0c829fdce5630 Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sat, 5 Apr 2025 15:45:08 +0200 Subject: [PATCH 2/4] Don't cache bin --- .github/workflows/check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c88dc12..8c0f24d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,7 +19,6 @@ jobs: - uses: actions/cache@v4 with: path: | - ~/.cargo/bin/ ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ From cb8323c49c09f93dacdeddc685bf8e34e32ea881 Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sat, 5 Apr 2025 15:58:41 +0200 Subject: [PATCH 3/4] Update --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8c0f24d..b4e6e7d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -36,8 +36,8 @@ jobs: --gh-token ${{ secrets.GITHUB_TOKEN }} - run: > jas install - --url https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-6.0.1-amd64-static.tar.xz - --sha 28268bf402f1083833ea269331587f60a242848880073be8016501d864bd07a5 + --url https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz + --sha abda8d77ce8309141f83ab8edf0596834087c52467f6badf376a6a2a4c87cf67 - run: | echo "DEEPINFRA_KEY=${{ secrets.DEEPINFRA_KEY }}" > keys.env echo "ELEVENLABS_KEY=${{ secrets.ELEVENLABS_KEY }}" >> keys.env From 5cd34bcf7775b1d0056eaa00dd64163405d1ff5d Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sat, 5 Apr 2025 16:05:46 +0200 Subject: [PATCH 4/4] Update --- .github/workflows/check.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b4e6e7d..a8682fb 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -38,11 +38,17 @@ jobs: jas install --url https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz --sha abda8d77ce8309141f83ab8edf0596834087c52467f6badf376a6a2a4c87cf67 + - run: > + jas install + --url https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz + --archive-filename ffprobe + --sha abda8d77ce8309141f83ab8edf0596834087c52467f6badf376a6a2a4c87cf67 - run: | echo "DEEPINFRA_KEY=${{ secrets.DEEPINFRA_KEY }}" > keys.env echo "ELEVENLABS_KEY=${{ secrets.ELEVENLABS_KEY }}" >> keys.env echo "GOOGLE_KEY=${{ secrets.GOOGLE_KEY }}" >> keys.env echo "OPENAI_KEY=${{ secrets.OPENAI_KEY }}" >> keys.env + - run: cargo test --no-run - run: cargo test --all-features - name: Cleanup before Post Run run: rm keys.env @@ -54,11 +60,11 @@ jobs: steps: - uses: actions/checkout@v4 - run: cargo install --debug --git https://github.com/rikhuijzer/jas - - run: | - jas install --gh crate-ci/typos@v1.31.1 \ - --sha f683c2abeaff70379df7176110100e18150ecd17a4b9785c32908aca11929993 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: > + jas install + --gh crate-ci/typos@v1.31.1 + --sha f683c2abeaff70379df7176110100e18150ecd17a4b9785c32908aca11929993 + --gh-token ${{ secrets.GITHUB_TOKEN }} - run: typos . fmt: