diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index efee77fdb3..6f70ebe9d8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,8 +86,7 @@ jobs: matrix: include: - os: ubuntu-latest - # Ignoring Mac until we find a solution to: https://github.com/ethereum/fe/pull/106/checks?check_run_id=1322145918 - # - os: macOS-latest + - os: macOS-latest steps: - uses: actions/checkout@v2 - name: Cache Rust dependencies @@ -141,16 +140,29 @@ jobs: needs: [lint, test, wasm-test] strategy: matrix: - os: [ubuntu-latest] + include: + - os: ubuntu-latest + BIN_FILE: fe_amd64 + - os: macOS-latest + BIN_FILE: fe_mac steps: - uses: actions/checkout@v2 - name: Install Linux dependencies if: startsWith(matrix.os,'ubuntu') run: | + sudo apt-get update + sudo apt-get upgrade -y sudo apt-get install -y libboost-all-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50 - sudo update-alternatives --set g++ "/usr/bin/g++-8" + sudo apt-get install g++ -y + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 50 + sudo update-alternatives --set g++ "/usr/bin/g++-9" + sudo apt-get install cmake -y + sudo apt-get install -y libclang-dev + - name: Install Mac System dependencies + if: startsWith(matrix.os,'macOS') + run: | + brew install boost - name: Install latest nightly uses: actions-rs/toolchain@v1 with: @@ -158,11 +170,11 @@ jobs: toolchain: nightly override: true - name: Build - run: cargo build --all-features --release && strip target/release/fe && mv target/release/fe target/release/fe_amd64 + run: cargo build --all-features --release && strip target/release/fe && mv target/release/fe target/release/${{ matrix.BIN_FILE }} - name: Release uses: softprops/action-gh-release@v1 with: - files: target/release/fe_amd64 + files: target/release/${{ matrix.BIN_FILE }} prerelease: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file