From 88e0929a9543d7deaa519be365764a22929d55ab Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Thu, 14 Sep 2023 13:46:43 +0800 Subject: [PATCH 1/2] clean: remove unmet condition --- .github/workflows/macos-homebrew-PR-check.yml | 7 +------ .github/workflows/macos-homebrew-breakpad.yml | 7 ------- .github/workflows/macos-homebrew.yml | 7 ------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml index bc708717..c89823ff 100644 --- a/.github/workflows/macos-homebrew-PR-check.yml +++ b/.github/workflows/macos-homebrew-PR-check.yml @@ -30,12 +30,7 @@ jobs: env: targetName: GoldenDict steps: - # - name: prepare env - # run: | - # cd /opt - # mkdir homebrew - # curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C homebrew - # export PATH=$PATH:/opt/homebrew/bin + - name: Install Qt uses: jurplel/install-qt-action@v3 with: diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml index 608f477f..5bed4e03 100644 --- a/.github/workflows/macos-homebrew-breakpad.yml +++ b/.github/workflows/macos-homebrew-breakpad.yml @@ -30,13 +30,6 @@ jobs: version-suffix: alpha prerelease: true steps: - # macos 11.0 默认环境变了,要指定 - - name: prepare env - if: ${{ matrix.os == 'macos-11' }} - run: | - softwareupdate --all --install --force - sudo xcode-select --print-path - sudo xcode-select --switch /Library/Developer/CommandLineTools - uses: actions/checkout@v3 with: diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 4e4067f5..d22cb76c 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -30,13 +30,6 @@ jobs: version-suffix: alpha prerelease: true steps: - # macos 11.0 默认环境变了,要指定 - - name: prepare env - if: ${{ matrix.os == 'macos-11' }} - run: | - softwareupdate --all --install --force - sudo xcode-select --print-path - sudo xcode-select --switch /Library/Developer/CommandLineTools - uses: actions/checkout@v3 with: From 49dd2c0d5abc9429261e7c4a563277cc9a614ecb Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Thu, 14 Sep 2023 14:22:18 +0800 Subject: [PATCH 2/2] macos: hdiutil create failed with resource busy --- .github/workflows/macos-homebrew.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index d22cb76c..58e03aac 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -129,7 +129,7 @@ jobs: mkdir tmp mv ${targetName}.app ./tmp # --background "installer_background.png" - create-dmg --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/ + create-dmg --hdiutil-verbose --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/ - name: changelog id: changelog run: |