diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ba76312..d44ca73 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,22 +21,15 @@ jobs: - name: Create Build Environment - # Some projects don't allow in-source building, so create a separate build directory - # We'll use this as our working directory for all subsequent commands + # Create working directory run: cmake -E make_directory ${{github.workspace}}/build - name: Configure CMake - # Use a bash shell so we can use the same syntax for environment variable - # access regardless of the host operating system working-directory: ${{github.workspace}}/build - # Note the current convention is to use the -S and -B options here to specify source - # and build directories, but this is only available with CMake 3.13 and higher. - # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE "-DJUPITER_VERSION_SHORT=Ubuntu.SHA-$(git rev-parse --short $GITHUB_SHA)" - name: Build working-directory: ${{github.workspace}}/build - # Execute the build. You can specify a specific target with "--target " run: cmake --build . --config $BUILD_TYPE --target=PackagedBuild - name: Archive build package / binaries @@ -55,22 +48,17 @@ jobs: - name: Create Build Environment - # Some projects don't allow in-source building, so create a separate build directory - # We'll use this as our working directory for all subsequent commands - run: cmake -E make_directory ${{github.workspace}}/build + # Create working directory & install non-default dependencies (openssl) + run: | + cmake -E make_directory ${{github.workspace}}/build + choco install openssl - name: Configure CMake - # Use a bash shell so we can use the same syntax for environment variable - # access regardless of the host operating system working-directory: ${{github.workspace}}/build - # Note the current convention is to use the -S and -B options here to specify source - # and build directories, but this is only available with CMake 3.13 and higher. - # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE "-DJUPITER_VERSION_SHORT=Win.SHA-$(git rev-parse --short $env:GITHUB_SHA)" - name: Build working-directory: ${{github.workspace}}/build - # Execute the build. You can specify a specific target with "--target " run: cmake --build . --config $env:BUILD_TYPE --target=PackagedBuild - name: Archive build package / binaries