From 537507b8db71e1218ea04fadd239fa5f3f50e042 Mon Sep 17 00:00:00 2001 From: Julie Schwartz Date: Fri, 5 Apr 2024 19:48:29 +1300 Subject: [PATCH] GitHub CI: Update brew/apt-get before install The macOS VMs have recently failed to install mactex, because the download URL is not found. This is probably because "brew update" is not being called, to update the formulae. On Ubuntu, where apt-get is used to install, in most cases "apt-get update" was being called, but there was one place (Toooba test) that was missing. --- .github/workflows/build-and-test-macos.yml | 1 + .github/workflows/build-and-test-ubuntu.yml | 1 + .github/workflows/install_dependencies_doc_macos.sh | 2 ++ .github/workflows/install_dependencies_doc_ubuntu.sh | 1 + .github/workflows/install_dependencies_macos.sh | 2 ++ .github/workflows/install_dependencies_releasenotes_ubuntu.sh | 1 + .github/workflows/install_dependencies_testsuite_macos.sh | 2 ++ .github/workflows/install_dependencies_ubuntu.sh | 1 + 8 files changed, 11 insertions(+) diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index 45bd74886..55cf914cd 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -196,6 +196,7 @@ jobs: - name: Install dependencies run: | + brew update brew install ccache libelf - name: Download bsc diff --git a/.github/workflows/build-and-test-ubuntu.yml b/.github/workflows/build-and-test-ubuntu.yml index 2f01cd2f7..910fcd486 100644 --- a/.github/workflows/build-and-test-ubuntu.yml +++ b/.github/workflows/build-and-test-ubuntu.yml @@ -179,6 +179,7 @@ jobs: - name: Install dependencies run: | + sudo apt-get update sudo apt-get install -y ccache libelf-dev - name: Download bsc diff --git a/.github/workflows/install_dependencies_doc_macos.sh b/.github/workflows/install_dependencies_doc_macos.sh index 6807b4700..79a50b46e 100755 --- a/.github/workflows/install_dependencies_doc_macos.sh +++ b/.github/workflows/install_dependencies_doc_macos.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +brew update + brew install mactex-no-gui diff --git a/.github/workflows/install_dependencies_doc_ubuntu.sh b/.github/workflows/install_dependencies_doc_ubuntu.sh index 688e89fbf..ec6d3481c 100755 --- a/.github/workflows/install_dependencies_doc_ubuntu.sh +++ b/.github/workflows/install_dependencies_doc_ubuntu.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + apt-get update apt-get install -y \ diff --git a/.github/workflows/install_dependencies_macos.sh b/.github/workflows/install_dependencies_macos.sh index cf3e8afb9..455323700 100755 --- a/.github/workflows/install_dependencies_macos.sh +++ b/.github/workflows/install_dependencies_macos.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +brew update + # ccache is not required to build bsc, but we use it in build.yml to improve # the build performance by caching C++ obj files across multiple builds. brew install \ diff --git a/.github/workflows/install_dependencies_releasenotes_ubuntu.sh b/.github/workflows/install_dependencies_releasenotes_ubuntu.sh index c3a16dbd1..84badc621 100755 --- a/.github/workflows/install_dependencies_releasenotes_ubuntu.sh +++ b/.github/workflows/install_dependencies_releasenotes_ubuntu.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + apt-get update apt-get install -y \ diff --git a/.github/workflows/install_dependencies_testsuite_macos.sh b/.github/workflows/install_dependencies_testsuite_macos.sh index 47f2c7421..52ee3d4f4 100755 --- a/.github/workflows/install_dependencies_testsuite_macos.sh +++ b/.github/workflows/install_dependencies_testsuite_macos.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +brew update + brew install \ ccache \ deja-gnu \ diff --git a/.github/workflows/install_dependencies_ubuntu.sh b/.github/workflows/install_dependencies_ubuntu.sh index 7ce7ba99c..b61fb4535 100755 --- a/.github/workflows/install_dependencies_ubuntu.sh +++ b/.github/workflows/install_dependencies_ubuntu.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + apt-get update # ccache is not required to buid bsc, but we use it in build.yml to improve