summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKanariKanaru <93921745+kanarikanaru@users.noreply.github.com>2025-01-14 20:27:44 +0900
committerGitHub <noreply@github.com>2025-01-14 20:27:44 +0900
commit9ddf7751dbe24aedf4b9ca75e9da7dfd3021f903 (patch)
tree2ba8564f8e00f8357534864cba7094b45c5a23cc
parentrefactor: SystemWebhook/UserWebhookの配信処理呼び出し部分の改善... (diff)
downloadsharkey-9ddf7751dbe24aedf4b9ca75e9da7dfd3021f903.tar.gz
sharkey-9ddf7751dbe24aedf4b9ca75e9da7dfd3021f903.tar.bz2
sharkey-9ddf7751dbe24aedf4b9ca75e9da7dfd3021f903.zip
Enhance: GitHub Actionsでのffmpegインストールの失敗時リトライするように (#15079)
-rw-r--r--.github/workflows/test-backend.yml15
-rw-r--r--.github/workflows/test-federation.yml15
2 files changed, 28 insertions, 2 deletions
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index fc614dcf85..3b2ef91ff3 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -44,7 +44,20 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Install FFmpeg
- uses: FedericoCarboni/setup-ffmpeg@v3
+ run: |
+ for i in {1..3}; do
+ echo "Attempt $i: Installing FFmpeg..."
+ curl -s -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o ffmpeg.tar.xz && \
+ tar -xf ffmpeg.tar.xz && \
+ mv ffmpeg-*-static/ffmpeg /usr/local/bin/ && \
+ mv ffmpeg-*-static/ffprobe /usr/local/bin/ && \
+ rm -rf ffmpeg.tar.xz ffmpeg-*-static/ && \
+ break || sleep 10
+ if [ $i -eq 3 ]; then
+ echo "Failed to install FFmpeg after 3 attempts"
+ exit 1
+ fi
+ done
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4.0.4
with:
diff --git a/.github/workflows/test-federation.yml b/.github/workflows/test-federation.yml
index e89cdcb091..9c29734c6d 100644
--- a/.github/workflows/test-federation.yml
+++ b/.github/workflows/test-federation.yml
@@ -28,7 +28,20 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Install FFmpeg
- uses: FedericoCarboni/setup-ffmpeg@v3
+ run: |
+ for i in {1..3}; do
+ echo "Attempt $i: Installing FFmpeg..."
+ curl -s -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o ffmpeg.tar.xz && \
+ tar -xf ffmpeg.tar.xz && \
+ mv ffmpeg-*-static/ffmpeg /usr/local/bin/ && \
+ mv ffmpeg-*-static/ffprobe /usr/local/bin/ && \
+ rm -rf ffmpeg.tar.xz ffmpeg-*-static/ && \
+ break || sleep 10
+ if [ $i -eq 3 ]; then
+ echo "Failed to install FFmpeg after 3 attempts"
+ exit 1
+ fi
+ done
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4.0.3
with: