From 2f4d026fe7cf16aa7a31a33f4132ef420b3e0724 Mon Sep 17 00:00:00 2001 From: Joe George Date: Thu, 21 Dec 2023 15:35:47 -0500 Subject: [PATCH] changes --- .../setup-build-dependencies/action.yml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/actions/setup-build-dependencies/action.yml b/.github/actions/setup-build-dependencies/action.yml index c90f7ac9df2..a4571cf11e5 100644 --- a/.github/actions/setup-build-dependencies/action.yml +++ b/.github/actions/setup-build-dependencies/action.yml @@ -6,30 +6,29 @@ runs: steps: - name: Install brew dependencies run: brew install python3 ruby openjdk node php lmdb mcpp - - name: Install test dependencies - run: python3 -m pip install passlib cryptography + if: startsWith(matrix.os, 'macos') - if: startsWith(matrix.os, 'ubuntu') - steps: - - name: Install dependencies + - name: Install apt dependencies run: sudo apt-get install -y python3 python3-pip nodejs libbz2-dev libssl-dev libffi-dev libmcpp-dev libedit-dev liblmdb-dev libexpat1-dev libsystemd-dev openjdk-17-jdk ruby ruby-dev php-cli php-dev - - name: Install test dependencies - run: python3 -m pip install passlib cryptography + if: startsWith(matrix.os, 'ubuntu') - if: startsWith(matrix.os, 'windows') - steps: - # - name: Install dependencies + # - name: Install dependencies # run: choco --yes install - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 with: msbuild-architecture: x64 + if: startsWith(matrix.os, 'windows') - name: Setup Python uses: actions/setup-python@v5 with: python-version: "3.12" + if: startsWith(matrix.os, 'windows') - name: Configure Environment run: | echo "PythonHome=$env:Python_ROOT_DIR" >> $env:GITHUB_ENV - - name: Install test dependencies - run: python -m pip install passlib cryptography python-dev-tools + if: startsWith(matrix.os, 'windows') + + - name: Install testing dependencies from pip + run: python3 -m pip install passlib cryptography + if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')