diff --git a/.github/workflows/macos-6.x.yml b/.github/workflows/macos-6.x.yml index ff383d65..d5994372 100644 --- a/.github/workflows/macos-6.x.yml +++ b/.github/workflows/macos-6.x.yml @@ -61,7 +61,7 @@ jobs: run: | previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-) echo "$previousTag">version.txt - - name: build macos + - name: install deps on macos run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 xz lzo libogg libvorbis zstd || true brew install create-dmg diff --git a/.github/workflows/macos-PR-check.yml b/.github/workflows/macos-PR-check.yml index e2e6cfc1..05f13d6c 100644 --- a/.github/workflows/macos-PR-check.yml +++ b/.github/workflows/macos-PR-check.yml @@ -60,7 +60,7 @@ jobs: with: fetch-depth: 1 - - name: build macos + - name: install deps on macos run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 xz lzo libogg libvorbis zstd || true brew install create-dmg diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml index 351b04b1..6f96cc6e 100644 --- a/.github/workflows/macos-homebrew-PR-check.yml +++ b/.github/workflows/macos-homebrew-PR-check.yml @@ -49,7 +49,7 @@ jobs: run: | echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: build macos + - name: install deps on macos run: | brew install pcre2 harfbuzz freetype brew install cmake ninja python @@ -57,8 +57,8 @@ jobs: brew install autoconf brew install libtool brew install opencc - brew install ffmpeg@5 - #brew reinstall $(brew deps ffmpeg) ffmpeg + brew tap homebrew-ffmpeg/ffmpeg + brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex brew install libao brew install libiconv brew install lzo bzip2 diff --git a/.github/workflows/macos-homebrew-xapian.yml b/.github/workflows/macos-homebrew-xapian.yml index 581ca189..732ac69c 100644 --- a/.github/workflows/macos-homebrew-xapian.yml +++ b/.github/workflows/macos-homebrew-xapian.yml @@ -57,7 +57,7 @@ jobs: run: | echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: build macos + - name: install deps on macos run: | brew install pcre2 harfbuzz freetype brew install cmake ninja python diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index a2f47067..eef298e9 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -57,7 +57,7 @@ jobs: run: | echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: build macos + - name: install deps on macos run: | brew install pcre2 harfbuzz freetype brew install cmake ninja python diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 02d32752..35e7eeaf 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -65,7 +65,7 @@ jobs: previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-) echo "$previousTag">version.txt - - name: build macos + - name: install deps on macos run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 xz lzo libogg libvorbis zstd || true brew install create-dmg