Skip to content

Commit

Permalink
Update homebrew formula to fix deprecations, fixes #2942, fixes ddev/…
Browse files Browse the repository at this point in the history
…homebrew-ddev#43 (#2950)

* Remove the homebrew no-auto-update stuff [skip ci][ci skip]
  • Loading branch information
rfay committed Apr 16, 2021
1 parent 1213bcb commit 6400e0e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 22 deletions.
31 changes: 13 additions & 18 deletions .circleci/bump_homebrew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,19 @@ cd ${TMPDIR} && git clone https://github.com/${GITHUB_REPO} && cd "$(basename ${

cat >Formula/${PROJECT_NAME}.rb <<END
class Ddev < Formula
desc "ddev: a local development environment management system"
desc "Local development environment management system"
homepage "https://ddev.readthedocs.io/en/stable/"
url "${SOURCE_URL}"
sha256 "${SOURCE_SHA}"
# depends_on "docker" => :run
# depends_on "docker-compose" => :run
depends_on "docker" => :build
depends_on "go" => :build
depends_on "mkcert" => :run
depends_on "nss" => :run
bottle do
root_url "https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/releases/download/${VERSION_NUMBER}/"
cellar :any_skip_relocation
sha256 "${LINUX_BOTTLE_SHA}" => :x86_64_linux
sha256 "${MACOS_AMD64_BOTTLE_SHA}" => :high_sierra
sha256 "${MACOS_ARM64_BOTTLE_SHA}" => :arm64_big_sur
sha256 cellar: :any_skip_relocation, x86_64_linux: "${LINUX_BOTTLE_SHA}"
sha256 cellar: :any_skip_relocation, high_sierra: "${MACOS_AMD64_BOTTLE_SHA}"
sha256 cellar: :any_skip_relocation, arm64_big_sur: "${MACOS_ARM64_BOTTLE_SHA}"
end
def install
system "make", "VERSION=v#{version}", "COMMIT=v#{version}"
Expand All @@ -66,17 +61,17 @@ class Ddev < Formula
fish_completion.install ".gotmp/bin/ddev_fish_completion.sh" => "ddev"
end
test do
system "#{bin}/ddev", "--version"
end
def caveats
<<~EOS
Make sure to do a 'mkcert -install' if you haven't done it before, it may require your sudo password.
<<~EOS
Make sure to do a 'mkcert -install' if you haven't done it before, it may require your sudo password.
#{" "}
ddev requires docker and docker-compose.
Docker installation instructions at https://ddev.readthedocs.io/en/stable/users/docker_installation/
EOS
end
ddev requires docker and docker-compose.
Docker installation instructions at https://ddev.readthedocs.io/en/stable/users/docker_installation/
EOS
test do
system "#{bin}/ddev", "--version"
end
end
END
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ jobs:

release_build:
macos:
xcode: "11.3.1"
xcode: "12.4.0"
working_directory: ~/ddev
environment:
DDEV_DEBUG: "true"
Expand Down
3 changes: 0 additions & 3 deletions .circleci/macos_circle_vm_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ DOCKER_URL=https://download.docker.com/mac/stable/31259/Docker.dmg
curl -O -sSL $DOCKER_URL
open -W Docker.dmg && cp -r /Volumes/Docker/Docker.app /Applications

export HOMEBREW_NO_AUTO_UPDATE=1
export HOMEBREW_NO_INSTALL_CLEANUP=1

# Get docker in first so we can install it and work on other things
sudo /Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended
nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended &
Expand Down

0 comments on commit 6400e0e

Please sign in to comment.