diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml index 2ed31b7..d43c5c7 100644 --- a/.github/workflows/_build.yml +++ b/.github/workflows/_build.yml @@ -12,12 +12,12 @@ on: description: GitHub Actions runner OS type: string required: false - default: "macos-11" + default: "macos-12" build_os: description: Target OS to build for type: string required: false - default: "macos-11" + default: "macos-12" git_ref: description: Git ref to build type: string diff --git a/.github/workflows/_prepare.yml b/.github/workflows/_prepare.yml index 150d084..3a78885 100644 --- a/.github/workflows/_prepare.yml +++ b/.github/workflows/_prepare.yml @@ -7,7 +7,7 @@ on: description: GitHub Actions runner OS type: string required: false - default: "macos-11" + default: "macos-12" builder_ref: description: Git ref to checkout of build-emacs-for-macos required: false diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index da2e0e9..af15146 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -8,7 +8,7 @@ on: description: GitHub Actions runner OS type: string required: false - default: "macos-11" + default: "macos-12" plan_artifact: description: Name of artifact containing a emacs-builder plan yaml file type: string @@ -21,6 +21,11 @@ on: description: "Test build name" type: string required: false + update_casks: + description: "Update casks in homebrew tap?" + type: boolean + required: true + default: true secrets: TAP_REPO_TOKEN: description: Personal Access Token for Homebrew Tap repo @@ -57,7 +62,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Trigger update casks workflow in homebrew tap - if: ${{ steps.dmg.outputs.result != 'fail' && inputs.test_build_name == '' }} + if: >- + steps.dmg.outputs.result != 'fail' && + inputs.test_build_name == '' && + inputs.update_casks run: >- gh workflow run --repo jimeh/homebrew-emacs-builds update-casks.yml env: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 924b5a6..c794952 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,9 @@ on: required: false default: "" os: - description: 'Runner OS ("macos-11", "macos-12", or "macos-latest")' + description: 'Runner OS ("macos-12", "macos-13", or "macos-latest")' required: true - default: "macos-11" + default: "macos-12" test_build_name: description: "Test build name" required: false @@ -62,7 +62,7 @@ jobs: needs: [prepare] with: os: ${{ github.event.inputs.os }} - build_os: "macos-11" + build_os: "macos-12" artifact_prefix: "x86_64-" git_ref: ${{ github.event.inputs.git_ref }} git_sha: ${{ github.event.inputs.git_sha }} @@ -89,6 +89,7 @@ jobs: plan_artifact: x86_64-build-plan dmg_artifact: x86_64-dmg test_build_name: ${{ github.event.inputs.test_build_name }} + update_casks: true secrets: TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }} @@ -130,5 +131,6 @@ jobs: plan_artifact: arm64-build-plan dmg_artifact: arm64-dmg test_build_name: ${{ github.event.inputs.test_build_name }} + update_casks: false secrets: TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }} diff --git a/.github/workflows/nightly-master.yml b/.github/workflows/nightly-master.yml index 081f31a..f4e38e1 100644 --- a/.github/workflows/nightly-master.yml +++ b/.github/workflows/nightly-master.yml @@ -31,7 +31,7 @@ jobs: uses: ./.github/workflows/_build.yml needs: [prepare] with: - build_os: "macos-11" + build_os: "macos-12" artifact_prefix: "x86_64-" git_ref: "master" git_sha: ${{ github.event.inputs.git_sha }} @@ -53,6 +53,7 @@ jobs: with: plan_artifact: x86_64-build-plan dmg_artifact: x86_64-dmg + update_casks: true secrets: TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }} @@ -88,5 +89,6 @@ jobs: with: plan_artifact: arm64-build-plan dmg_artifact: arm64-dmg + update_casks: false secrets: TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}