From 229601f30599a179eacf4842d8cf8c178001eca4 Mon Sep 17 00:00:00 2001 From: Tim Zinsky Date: Mon, 9 Oct 2023 18:04:58 -0500 Subject: [PATCH] Modify homebrew testing to use new CI settings Homebrew moved their CI to use Ubuntu 22.04 and added a flag to allow Linux testing to impersonate a Mac. Signed-off-by: Tim Zinsky --- util/packaging/docker/test/Dockerfile | 6 ++---- util/packaging/docker/test/brew_install.bash | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/util/packaging/docker/test/Dockerfile b/util/packaging/docker/test/Dockerfile index 598291313803..6a06fa752a6a 100644 --- a/util/packaging/docker/test/Dockerfile +++ b/util/packaging/docker/test/Dockerfile @@ -1,12 +1,10 @@ # This is a container used to run homebrew-ci -# Get the ubuntu container -FROM homebrew/ubuntu20.04:latest +# Get the homebrew ubuntu container +FROM FROM ghcr.io/homebrew/ubuntu22.04:master RUN mkdir -p /home/linuxbrew # COPY chapel.rb and chapel*.tar.gz inside the container to run homebrew install COPY chapel.rb /home/linuxbrew/ COPY chapel*.tar.gz /home/linuxbrew/ - - diff --git a/util/packaging/docker/test/brew_install.bash b/util/packaging/docker/test/brew_install.bash index a7927559a451..164503b951ca 100755 --- a/util/packaging/docker/test/brew_install.bash +++ b/util/packaging/docker/test/brew_install.bash @@ -1,4 +1,7 @@ #!/usr/bin/env bash +export HOMEBREW_SIMULATE_MACOS_ON_LINUX=1 +#Update homebrew +brew update #Script used in docker exec command to test homebrew formula brew test-bot --only-tap-syntax