From 379f77af48dba245b46ee9d45d8362531993bfac Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 21 Dec 2020 11:54:33 +0100 Subject: [PATCH] Cleaned up github actions --- .github/workflows/build.yml | 88 +++---------------------------------- 1 file changed, 6 insertions(+), 82 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0286dc332..b3e53c3a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,6 @@ env: jobs: - linux: runs-on: ubuntu-20.04 name: 馃惂 Ubuntu 20.04 @@ -43,7 +42,7 @@ jobs: run: | mkdir build cd build - CC=gcc-10 CXX=g++-10 cmake .. + CC=gcc-10 CXX=g++-10 cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. make -j 4 @@ -55,7 +54,7 @@ jobs: include: - { msystem: MINGW64, arch: x86_64 } #- { msystem: MINGW32, arch: i686 } # currently fail - name: 馃煪 ${{ matrix.msystem }} 路 ${{ matrix.arch }} 路 manual + name: 馃煢 ${{ matrix.msystem }} 路 ${{ matrix.arch }} defaults: run: shell: msys2 {0} @@ -68,7 +67,7 @@ jobs: with: fetch-depth: 0 - - name: 馃煪 Setup MSYS2 + - name: 猬囷笍 Install dependencies uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} @@ -91,53 +90,10 @@ jobs: run: | mkdir build cd build - cmake -G "MinGW Makefiles" .. + cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. mingw32-make -j 4 - win-makepkg: - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - include: - - { msystem: MINGW64, arch: x86_64 } - #- { msystem: MINGW32, arch: i686 } # currently fail - name: 馃煪 ${{ matrix.msystem }} 路 ${{ matrix.arch }} 路 makepkg - defaults: - run: - shell: msys2 {0} - steps: - - - run: git config --global core.autocrlf input - shell: bash - - - name: 馃О Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: 馃煪 Setup MSYS2 - uses: msys2/setup-msys2@v2 - with: - msystem: ${{ matrix.msystem }} - update: true - install: > - base-devel - mingw-w64-${{ matrix.arch }}-toolchain - - - name: 馃敡 Build - run: | - cd msys2 - makepkg-mingw --noconfirm --noprogressbar -sCLf - env: - MINGW_INSTALLS: ${{ matrix.msystem }} - - - name: '馃摛 Upload artifact: package' - uses: actions/upload-artifact@v2 - with: - path: msys2/*.zst - macos-build: runs-on: macos-11.0 name: 馃崕 macOS 11.0 @@ -156,37 +112,5 @@ jobs: run: | mkdir build cd build - CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake .. - make -j 4 - - win-test: - needs: win-makepkg - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - include: - - { msystem: MINGW64, arch: x86_64 } - #- { msystem: MINGW32, arch: i686 } # currently fail - name: 馃煪 ${{ matrix.msystem }} 路 ${{ matrix.arch }} 路 test - defaults: - run: - shell: msys2 {0} - steps: - - - name: 馃煪 Setup MSYS2 - uses: msys2/setup-msys2@v2 - with: - msystem: ${{ matrix.msystem }} - update: true - - - name: '馃摜 Download artifacts' - uses: actions/download-artifact@v2 - - - name: 鈿欙笍 Install - run: | - pacman -U --noconfirm --noprogressbar artifact/*.zst - - - name: 鈻讹笍 Test - run: | - which ImHex + CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. + make -j 4 \ No newline at end of file