From 88abe3ebd1884a20df1c9ef225ca16aff1c30628 Mon Sep 17 00:00:00 2001 From: zCubed3 Date: Wed, 17 Jan 2024 22:34:11 -0800 Subject: [PATCH] Tweak the CI stuff --- .github/workflows/ci_sanity.yml | 2 +- .github/workflows/ci_windows.yml | 53 ++++++++++++++------------------ 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci_sanity.yml b/.github/workflows/ci_sanity.yml index a56a880..3dd3f7b 100644 --- a/.github/workflows/ci_sanity.yml +++ b/.github/workflows/ci_sanity.yml @@ -12,7 +12,7 @@ env: jobs: build: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 77ecf19..0dc37a9 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -1,40 +1,33 @@ -name: CI Windows +name: CI Build Linux 🐧| Windows 🖥️ -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -env: - CARGO_TERM_COLOR: always +on: [ push, pull_request, workflow_dispatch ] jobs: - build: - - runs-on: ubuntu-latest - + # The CMake configure and build commands are platform-agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + build_all: + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, windows-latest ] + include: + - os: ubuntu-latest + artifact-name: ubuntu-build + + - os: windows-latest + artifact-name: windows-build + + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 with: submodules: 'true' - name: Build Debug - run: cargo build --verbose + run: cargo build - name: Build Release - run: cargo build --release --verbose - - - name: Bundle CI Results - shell: bash - run: bash ./scripts/bundle_ci.sh - env: - CI_DLIB: dll - CI_SLIB: lib - CI_EXE: .exe - - - uses: actions/upload-artifact@v3 - with: - name: binaries - path: | - ci_build/* + run: cargo build --release \ No newline at end of file