Skip to content

Commit

Permalink
Merge branch 'apriltags-2.0.0' of https://github.com/deltacv/AprilTag…
Browse files Browse the repository at this point in the history
…Desktop into apriltags-2.0.0
  • Loading branch information
serivesmejia committed Aug 5, 2023
2 parents 4ab1283 + 3fe6667 commit afe6481
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/build_natives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ env:
BUILD_TYPE: Debug

jobs:
build-windows:
build-linux:
# 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
runs-on: windows-latest
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- uses: actions/setup-java@v3
with:
distribution: 'adopt' # See 'Supported distributions' for available options
Expand All @@ -36,17 +35,17 @@ jobs:
# Build your program with the given configuration
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}}

build-linux:
needs: build-windows
build-windows:
# 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
runs-on: ubuntu-latest
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- uses: actions/setup-java@v3
with:
distribution: 'adopt' # See 'Supported distributions' for available options
Expand All @@ -62,7 +61,6 @@ jobs:
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}}

build-mac:
needs: build-linux
# 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
Expand Down

0 comments on commit afe6481

Please sign in to comment.