From 1b126b87ba53fe1859b7032cca0d1c73cd07306b Mon Sep 17 00:00:00 2001 From: Silvio Tomatis Date: Sat, 7 Dec 2024 23:17:41 +0100 Subject: [PATCH] ci: Update Homebrew dependency installation with verbose flag for libadwaita --- .github/workflows/build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f98b40..8555985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,15 +72,16 @@ jobs: # Create /usr/local if it doesn't exist sudo mkdir -p /usr/local sudo chown -R $(whoami) /usr/local - + # Install Homebrew for x86_64 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - + # Add Homebrew to PATH eval "$(/usr/local/bin/brew shellenv)" - + # Install dependencies - arch -x86_64 /usr/local/bin/brew install pkg-config gtk4 pango cairo gdk-pixbuf at-spi2-core graphene libadwaita + arch -x86_64 /usr/local/bin/brew install pkg-config gtk4 pango cairo gdk-pixbuf at-spi2-core graphene + arch -x86_64 /usr/local/bin/brew install -v libadwaita # Set pkg-config path for x86_64 echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/pango/lib/pkgconfig:/usr/local/opt/cairo/lib/pkgconfig:/usr/local/opt/gdk-pixbuf/lib/pkgconfig:/usr/local/opt/graphene/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/gtk4/lib/pkgconfig:/usr/local/opt/libadwaita/lib/pkgconfig" >> $GITHUB_ENV @@ -179,11 +180,11 @@ jobs: - name: Configure pkg-config paths run: | $installPrefix = "$env:VCPKG_ROOT\installed\$env:VCPKG_TRIPLET" - + # Add required paths to system PATH $env:Path = "$installPrefix\bin;$env:Path" $env:Path = "$env:VCPKG_ROOT\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin;$env:Path" - + # Set pkg-config environment variables $env:PKG_CONFIG = "$env:VCPKG_ROOT\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin\pkg-config.exe" $env:PKG_CONFIG_PATH = "$installPrefix\lib\pkgconfig" @@ -191,7 +192,7 @@ jobs: $env:PKG_CONFIG_ALLOW_CROSS = "1" $env:PKG_CONFIG_ALLOW_SYSTEM_CFLAGS = "1" $env:PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1" - + # Export variables to GITHUB_ENV "PKG_CONFIG=$env:PKG_CONFIG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append "PKG_CONFIG_PATH=$env:PKG_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append @@ -199,7 +200,7 @@ jobs: "PKG_CONFIG_ALLOW_CROSS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append "PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append "PKG_CONFIG_ALLOW_SYSTEM_LIBS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - + # Add to PATH for subsequent steps "$installPrefix\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append "$env:VCPKG_ROOT\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append