diff options
| author | falkTX <falktx@falktx.com> | 2021-07-31 13:36:06 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2021-07-31 13:36:06 +0100 |
| commit | 745796692c4c0a8929d3c3dd14cebbd56efc96d9 (patch) | |
| tree | 7172efe119c9992008fc686f48cb4fc969236c88 | |
| parent | 8340794aff817e72f473d4bc097b705a50ada79a (diff) | |
| download | jack2-745796692c4c0a8929d3c3dd14cebbd56efc96d9.tar.gz | |
Cleanup
Signed-off-by: falkTX <falktx@falktx.com>
| -rw-r--r-- | .github/workflows/build.yml | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9f568b2..58d714a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,9 +43,9 @@ jobs: shell: bash run: | pushd PawPaw && source local.env macos && popd - ~/PawPawBuilds/targets/macos/bin/python3 ./waf configure --platform=darwin --prefix=/usr/local - ~/PawPawBuilds/targets/macos/bin/python3 ./waf build -j $(sysctl -n hw.logicalcpu) - ~/PawPawBuilds/targets/macos/bin/python3 ./waf install --destdir="$(pwd)/destdir" + python ./waf configure --platform=darwin --prefix=/usr/local + python ./waf build -j $(sysctl -n hw.logicalcpu) + python ./waf install --destdir="$(pwd)/destdir" # macOS native universal build macos_universal: @@ -90,16 +90,10 @@ jobs: with: path: | ~/PawPawBuilds/builds - ~/PawPawBuilds/debs ~/PawPawBuilds/downloads ~/PawPawBuilds/targets /var/cache/apt/archives key: cache-win32 - #- name: Restore debian packages cache - #run: | - #if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ - #sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ - #fi - name: Set up dependencies run: | wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \ @@ -107,10 +101,6 @@ jobs: sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \ sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \ binutils-mingw-w64-i686 g++-mingw-w64-i686 - #- name: Cache debian packages - #run: | - #mkdir -p ~/PawPawBuilds/debs && \ - #sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ - name: Bootstrap win32 cross-compiled shell: bash run: | @@ -139,16 +129,10 @@ jobs: with: path: | ~/PawPawBuilds/builds - ~/PawPawBuilds/debs ~/PawPawBuilds/downloads ~/PawPawBuilds/targets /var/cache/apt/archives key: cache-win64 - #- name: Restore debian packages cache - #run: | - #if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ - #sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ - #fi - name: Set up dependencies run: | wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \ @@ -156,10 +140,6 @@ jobs: sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \ sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \ binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 - #- name: Cache debian packages - #run: | - #mkdir -p ~/PawPawBuilds/debs && \ - #sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ - name: Bootstrap win64 cross-compiled shell: bash run: | |