diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index b8eb0e2493..198451c0e9 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -19,12 +19,6 @@ on: - .github/workflows/test-backend.yml - .github/misskey/test.yml workflow_dispatch: - inputs: - force_ffmpeg_cache_update: - description: 'Force update ffmpeg cache' - required: false - default: false - type: boolean jobs: unit: @@ -62,36 +56,9 @@ jobs: submodules: true - name: Setup pnpm uses: pnpm/action-setup@v6.0.3 - - name: Get current date - id: current-date - run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - - name: Setup and Restore ffmpeg/ffprobe Cache - id: cache-ffmpeg - uses: actions/cache@v5 - with: - path: | - /usr/local/bin/ffmpeg - /usr/local/bin/ffprobe - # daily cache - key: ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }} - restore-keys: | - ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }} - name: Install FFmpeg - if: steps.cache-ffmpeg.outputs.cache-hit != 'true' || github.event.inputs.force_ffmpeg_cache_update == true 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 + sudo apt install -y ffmpeg - name: Use Node.js uses: actions/setup-node@v6.4.0 with: diff --git a/.github/workflows/test-federation.yml b/.github/workflows/test-federation.yml index a8b7831f44..0433931531 100644 --- a/.github/workflows/test-federation.yml +++ b/.github/workflows/test-federation.yml @@ -15,12 +15,6 @@ on: - packages/misskey-js/** - .github/workflows/test-federation.yml workflow_dispatch: - inputs: - force_ffmpeg_cache_update: - description: 'Force update ffmpeg cache' - required: false - default: false - type: boolean jobs: test: @@ -37,36 +31,9 @@ jobs: submodules: true - name: Setup pnpm uses: pnpm/action-setup@v6.0.3 - - name: Get current date - id: current-date - run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - - name: Setup and Restore ffmpeg/ffprobe Cache - id: cache-ffmpeg - uses: actions/cache@v5 - with: - path: | - /usr/local/bin/ffmpeg - /usr/local/bin/ffprobe - # daily cache - key: ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }} - restore-keys: | - ${{ runner.os }}-ffmpeg-${{ steps.current-date.outputs.today }} - name: Install FFmpeg - if: steps.cache-ffmpeg.outputs.cache-hit != 'true' || github.event.inputs.force_ffmpeg_cache_update == true 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 + sudo apt install -y ffmpeg - name: Use Node.js uses: actions/setup-node@v6.4.0 with: