From 5047af7e162a8844cb95247ccb0f8a5557e68f0e Mon Sep 17 00:00:00 2001 From: Hugues Hoppe Date: Wed, 8 Feb 2023 10:55:57 -0800 Subject: [PATCH 1/4] Use setup-ffmpeg in workflow. The command "sudo apt-get install ffmpeg" seems to no longer function correctly. --- .github/workflows/pytest_and_autopublish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest_and_autopublish.yml b/.github/workflows/pytest_and_autopublish.yml index 8703825..a2002a7 100644 --- a/.github/workflows/pytest_and_autopublish.yml +++ b/.github/workflows/pytest_and_autopublish.yml @@ -21,7 +21,9 @@ jobs: steps: - uses: actions/checkout@v3 - - run: sudo apt-get install ffmpeg + - name: Set up ffmpeg + - uses: FedericoCarboni/setup-ffmpeg@v2 + id: setup-ffmpeg # Install deps - name: Set up Python ${{ matrix.python-version }} From 33c2d52c816c9a91689a51c7c464532d3ab02bd5 Mon Sep 17 00:00:00 2001 From: Hugues Hoppe Date: Wed, 8 Feb 2023 10:58:54 -0800 Subject: [PATCH 2/4] Fix typo. --- .github/workflows/pytest_and_autopublish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest_and_autopublish.yml b/.github/workflows/pytest_and_autopublish.yml index a2002a7..d4b8af7 100644 --- a/.github/workflows/pytest_and_autopublish.yml +++ b/.github/workflows/pytest_and_autopublish.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up ffmpeg - - uses: FedericoCarboni/setup-ffmpeg@v2 + uses: FedericoCarboni/setup-ffmpeg@v2 id: setup-ffmpeg # Install deps From 9aebdf22c3e37487fae5c8ebfed70dcad7a596a5 Mon Sep 17 00:00:00 2001 From: Hugues Hoppe Date: Fri, 10 Feb 2023 16:30:19 -0800 Subject: [PATCH 3/4] Use simpler "apt update" approach from https://github.com/google/etils/blob/main/.github/workflows/pytest_and_autopublish.yml --- .github/workflows/pytest_and_autopublish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest_and_autopublish.yml b/.github/workflows/pytest_and_autopublish.yml index d4b8af7..9ca599d 100644 --- a/.github/workflows/pytest_and_autopublish.yml +++ b/.github/workflows/pytest_and_autopublish.yml @@ -21,9 +21,8 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up ffmpeg - uses: FedericoCarboni/setup-ffmpeg@v2 - id: setup-ffmpeg + - run: sudo apt update + - run: sudo apt install -y ffmpeg # Install deps - name: Set up Python ${{ matrix.python-version }} From 1dc72eec43ac3fd66e4771e68da93925ea541330 Mon Sep 17 00:00:00 2001 From: Hugues Hoppe Date: Fri, 10 Feb 2023 16:35:30 -0800 Subject: [PATCH 4/4] Use apt-get After reading the docs, it seems that "apt-get" is preferable to "apt" in scripts. --- .github/workflows/pytest_and_autopublish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest_and_autopublish.yml b/.github/workflows/pytest_and_autopublish.yml index 9ca599d..c347dbd 100644 --- a/.github/workflows/pytest_and_autopublish.yml +++ b/.github/workflows/pytest_and_autopublish.yml @@ -21,8 +21,8 @@ jobs: steps: - uses: actions/checkout@v3 - - run: sudo apt update - - run: sudo apt install -y ffmpeg + - run: sudo apt-get update + - run: sudo apt-get install -y ffmpeg # Install deps - name: Set up Python ${{ matrix.python-version }}