diff --git a/.github/hack/brew-install-version.sh b/.github/hack/brew-install-version.sh deleted file mode 100755 index fbd6028e..00000000 --- a/.github/hack/brew-install-version.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# This script only works for formulas in the homebrew-core. -# It assumes the homebrew-core has been checked out into ./homebrew-core. -# It only needs commit messages, so the checkout can be filtered with tree:0. - -set -eu -o pipefail - -FORMULA=$1 -VERSION=$2 - -export HOMEBREW_NO_AUTO_UPDATE=1 -export HOMEBREW_NO_INSTALL_UPGRADE=1 -export HOMEBREW_NO_INSTALL_CLEANUP=1 - -TAP=lima/tap -if ! brew tap | grep -q "^${TAP}\$"; then - brew tap-new "$TAP" -fi - -# Get the latest commit id for the commit that updated this bottle -SHA=$(git -C homebrew-core log --max-count 1 --grep "^${FORMULA}: update ${VERSION} bottle" --format="%H") -if [[ -z $SHA ]]; then - echo "${FORMULA} ${VERSION} not found" - exit 1 -fi - -OUTPUT="$(brew --repo "$TAP")/Formula/${FORMULA}.rb" -RAW="https://raw.githubusercontent.com/Homebrew/homebrew-core" -curl -s "${RAW}/${SHA}/Formula/${FORMULA::1}/${FORMULA}.rb" -o "$OUTPUT" - -if brew ls -1 | grep -q "^${FORMULA}\$"; then - brew uninstall "$FORMULA" --ignore-dependencies -fi -brew install "${TAP}/${FORMULA}" diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5482f35b..c8df9123 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -41,7 +41,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.23" - name: Build run: go build -v ./... diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 115dca38..b92ae22e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -32,23 +32,8 @@ jobs: with: go-version: "1.23" - - name: Fetch homebrew-core commit messages - uses: actions/checkout@v4 - with: - # needed by ./hack/brew-install-version.sh - repository: homebrew/homebrew-core - path: homebrew-core - fetch-depth: 0 - filter: tree:0 - - name: Install CLI deps - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" - run: | - brew install --overwrite python@3.12 kubectl docker coreutils lima - ./.github/hack/brew-install-version.sh qemu 8.2.1 + run: brew install kubectl docker coreutils lima - name: Build and Install run: make && sudo make install @@ -82,23 +67,8 @@ jobs: with: go-version: "1.23" - - name: Fetch homebrew-core commit messages - uses: actions/checkout@v4 - with: - # needed by ./hack/brew-install-version.sh - repository: homebrew/homebrew-core - path: homebrew-core - fetch-depth: 0 - filter: tree:0 - - name: Install CLI deps - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" - run: | - brew install --overwrite python@3.12 kubectl docker coreutils lima - ./.github/hack/brew-install-version.sh qemu 8.2.1 + run: brew install kubectl docker coreutils lima - name: Build and Install run: make && sudo make install @@ -132,23 +102,8 @@ jobs: with: go-version: "1.23" - - name: Fetch homebrew-core commit messages - uses: actions/checkout@v4 - with: - # needed by ./hack/brew-install-version.sh - repository: homebrew/homebrew-core - path: homebrew-core - fetch-depth: 0 - filter: tree:0 - - name: Install CLI deps - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" - run: | - brew install --overwrite python@3.12 kubectl docker coreutils lima - ./.github/hack/brew-install-version.sh qemu 8.2.1 + run: brew install kubectl docker coreutils lima - name: Build and Install run: make && sudo make install @@ -191,23 +146,8 @@ jobs: with: go-version: "1.23" - - name: Fetch homebrew-core commit messages - uses: actions/checkout@v4 - with: - # needed by ./hack/brew-install-version.sh - repository: homebrew/homebrew-core - path: homebrew-core - fetch-depth: 0 - filter: tree:0 - - name: Install CLI deps - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" - run: | - brew install --overwrite python@3.12 kubectl docker coreutils lima - ./.github/hack/brew-install-version.sh qemu 8.2.1 + run: brew install kubectl docker coreutils lima - name: Build and Install run: make && sudo make install @@ -250,23 +190,8 @@ jobs: with: go-version: "1.23" - - name: Fetch homebrew-core commit messages - uses: actions/checkout@v4 - with: - # needed by ./hack/brew-install-version.sh - repository: homebrew/homebrew-core - path: homebrew-core - fetch-depth: 0 - filter: tree:0 - - name: Install CLI deps - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" - run: | - brew install --overwrite python@3.12 kubectl docker coreutils lima incus - ./.github/hack/brew-install-version.sh qemu 8.2.1 + run: brew install kubectl docker coreutils lima incus - name: Build and Install run: make && sudo make install