From 0e2a105d79ec252b7f43ed15948db0261c0a4f03 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 21 Nov 2023 08:31:50 +0000 Subject: [PATCH] fix(workflows): update casks workflow for recent builds changes --- .github/workflows/update-casks.yml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/update-casks.yml b/.github/workflows/update-casks.yml index 4449675f..08ed8e37 100644 --- a/.github/workflows/update-casks.yml +++ b/.github/workflows/update-casks.yml @@ -17,10 +17,10 @@ on: jobs: update-casks: - runs-on: macos-11 + runs-on: macos-12 steps: - name: Checkout tap repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: main path: tap @@ -47,25 +47,18 @@ jobs: path: livecheck-results.json if-no-files-found: error - name: Checkout build-emacs-for-macos for emacs-builder tool - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: jimeh/build-emacs-for-macos - ref: "v0.6.30" - path: builder - - uses: actions/setup-go@v2 + ref: "v0.6.45" + - uses: actions/setup-go@v4 with: - go-version: 1.16 - - uses: actions/cache@v2 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + go-version: "1.21" - name: Build emacs-builder tool run: make build - working-directory: builder - name: Update casks run: >- - builder/bin/emacs-builder + bin/emacs-builder cask --builds-repository jimeh/emacs-builds update --templates-dir tap/templates ${{ github.event.inputs.extraArgs }} @@ -74,11 +67,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} update-meta: - runs-on: macos-11 + runs-on: macos-12 needs: [update-casks] steps: - name: Checkout tap repository main branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: main path: tap @@ -88,7 +81,7 @@ jobs: ln -s "${{ github.workspace }}/tap" \ "$(brew --repo)/Library/Taps/jimeh/homebrew-emacs-builds" - name: Checkout tap repository meta branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: meta path: meta