summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-29 02:27:14 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-29 21:24:23 +0100
commit53c9b9cbd6508685f18cf91377e1c9d7f9b16209 (patch)
tree23a8b92770ebfd984c4ff0bc8b8427700872721f /.github/workflows
parent18e88ed65d688708d6cba4bf7faf18aaa0d65eb6 (diff)
GitHub Actions: Add rsync to PATH
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build.yml14
1 files changed, 9 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e996b06ee..7483d21661 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -108,7 +108,12 @@ jobs:
- name: "[Windows] Install additional build tools"
if: runner.os == 'Windows'
- run: python -m pip install ninja git+https://github.com/frerich/clcache.git
+ # TODO: Add ninja, clcache and rsync to the windows buildenv
+ run: |
+ python -m pip install ninja git+https://github.com/frerich/clcache.git
+ $Env:PATH="C:\msys64\usr\bin;$Env:PATH"
+ pacman -S --noconfirm coreutils bash rsync openssh
+ Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH"
- name: "[Windows] Set up MSVC Developer Command Prompt"
if: runner.os == 'Windows'
@@ -260,12 +265,11 @@ jobs:
run: signtool sign /f $Env:WINDOWS_CODESIGN_CERTIFICATE_PATH /p $Env:WINDOWS_CODESIGN_CERTIFICATE_PASSWORD *.msi
working-directory: cmake_build
- - name: "[macOS] Upload build to downloads.mixxx.org"
+ - name: "[macOS/Windows] Upload build to downloads.mixxx.org"
# skip deploying Ubuntu builds to downloads.mixxx.org because these are deployed to the PPA
- if: runner.os == 'macOS' && env.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD != null
- run: tools/deploy.sh
+ if: runner.os != 'Linux' && env.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD != null
+ run: bash tools/deploy.sh ${{ matrix.artifacts_path }}
env:
- FILE_TO_DEPLOY: ${{ matrix.artifacts_path }}
OS: ${{ runner.os }}
DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
SSH_KEY: build/certificates/downloads-hostgator.mixxx.org.key