Skip to content

Commit

Permalink
Merge pull request #335 from na2na-p/chore/remove-ffmepg-in-asdf
Browse files Browse the repository at this point in the history
ffmpegをasdfの管理対象外にする
  • Loading branch information
2na2-p[bot] authored Dec 8, 2023
2 parents ed71775 + 49d3b69 commit d1626dc
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 22 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/cd-for-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/[email protected]
continue-on-error: true
- name: install ffmpeg dependencies
run: |
sudo apt-get update
sudo apt-get install -y nasm
- name: Cache asdf
uses: actions/cache@v3
with:
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/[email protected]
continue-on-error: true
- name: install ffmpeg dependencies
run: |
sudo apt-get update
sudo apt-get install -y nasm
- name: Cache asdf
uses: actions/cache@v3
with:
Expand All @@ -37,10 +33,6 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/[email protected]
continue-on-error: true
- name: install ffmpeg dependencies
run: |
sudo apt-get update
sudo apt-get install -y nasm
- name: Cache asdf
uses: actions/cache@v3
with:
Expand All @@ -63,10 +55,6 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/[email protected]
continue-on-error: true
- name: install ffmpeg dependencies
run: |
sudo apt-get update
sudo apt-get install -y nasm
- name: Cache asdf
uses: actions/cache@v3
with:
Expand All @@ -91,10 +79,6 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/[email protected]
continue-on-error: true
- name: install ffmpeg dependencies
run: |
sudo apt-get update
sudo apt-get install -y nasm
- name: Cache asdf
uses: actions/cache@v3
with:
Expand Down
1 change: 0 additions & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
nodejs 20.10.0
pnpm 8.11.0
python 3.11.6
ffmpeg 6.1
kubectl 1.28.4
argocd 2.9.3
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

## 必要なもの

.tool-versionsを参照してください
基本的には`.tool-versions`を参照してください
asdfを使っている場合はそのまま入ります。

- Node.js
- pnpm
- Python

Pythonは、`@discordjs/opus`の入れるのに必要です。
ただし、ランタイムで`ffmpeg`が必要になります。

## 登場するドメイン

Expand Down

0 comments on commit d1626dc

Please sign in to comment.