-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #662 from openziti/use-cmake-container
build for Linux in ziti-builder container
- Loading branch information
Showing
5 changed files
with
226 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| name: CMake build | ||
| description: CMake Composite Action | ||
|
|
||
| inputs: | ||
| preset: | ||
| required: true | ||
| description: vcpkg build preset, e.g, windows-arm64 | ||
|
|
||
| config: | ||
| default: Release | ||
| description: build type | ||
|
|
||
| target: | ||
| default: bundle | ||
| description: cmake build target | ||
|
|
||
| test_id: | ||
| description: Ziti Test Identity | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: simple build | ||
| run: echo "preset = ${{ inputs.preset }}" | ||
| shell: bash | ||
|
|
||
| - name: install contemporary cmake | ||
| uses: lukka/get-cmake@latest | ||
|
|
||
| - uses: lukka/run-vcpkg@v10 | ||
| with: | ||
| # use 2023.02.24 vcpkg baseline, | ||
| # see https://learn.microsoft.com/en-us/vcpkg/users/examples/versioning.getting-started#builtin-baseline | ||
| vcpkgGitCommitId: 'a7b6122f6b6504d16d96117336a0562693579933' | ||
|
|
||
| - uses: lukka/run-cmake@v10 | ||
| name: Configure CMake | ||
| with: | ||
| configurePreset: ci-${{ inputs.preset }} | ||
| configurePresetAdditionalArgs: "[ `-B`, `./build` ]" | ||
|
|
||
| - name: build ziti-edge-tunnel | ||
| shell: bash | ||
| run: | | ||
| cmake \ | ||
| --build ./build \ | ||
| --config ${{ inputs.config }} \ | ||
| --target ${{ inputs.target }} \ | ||
| --verbose |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # build this project in the ziti-builder container | ||
| # | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| BASENAME="$(basename "${0}")" | ||
| BASEDIR="$(cd "$(dirname "${0}")" && pwd)" | ||
| # set in ziti-builder image, but this default allows hacking the script to run | ||
| # outside the ziti-builder container | ||
| : "${GIT_CONFIG_GLOBAL:=/tmp/ziti-builder-gitconfig}" | ||
|
|
||
| [[ ${1:-} =~ -h|(--)?help ]] && { | ||
| echo -e "\nUsage: ${BASENAME} [CMD] [ARGS...]"\ | ||
| "\n\nRuns CMD in the ziti-builder container, and builds the"\ | ||
| "\ndefault target if no CMD is specified\n"\ | ||
| "\n -c [Release|Debug] set CMAKE_BUILD_TYPE (default: Release)"\ | ||
| "\n -p CMAKE_PRESET set CMAKE_TOOLCHAIN_FILE preset (default: ci-linux-x64)"\ | ||
| "\n -t [bundle|package] set CMAKE_TARGET (default: bundle)" | ||
| exit 0 | ||
| } | ||
|
|
||
| function set_git_safe_dirs() { | ||
| # workspace dir for each build env is added to "safe" dirs in global config | ||
| # so both runner and builder containers trust these dirs owned by different | ||
| # UIDs from that of Git's EUID. This is made necessary by newly-enforced | ||
| # directory boundaries in Git v2.35.2 ref: | ||
| # https://lore.kernel.org/git/[email protected]/ | ||
| local -a SAFE_DIRS=( | ||
| "/github/workspace" | ||
| ) | ||
| # the container environment defines GIT_CONFIG_GLOBAL=/tmp/gitconfig | ||
| for SAFE in "${SAFE_DIRS[@]}" "${@}"; do | ||
| git config --file "$GIT_CONFIG_GLOBAL" --add safe.directory "${SAFE}" | ||
| done | ||
| } | ||
|
|
||
| function set_workspace(){ | ||
| # let GitHub Actions override the workspace dir | ||
| if [[ -n "${GITHUB_WORKSPACE:-}" ]]; then | ||
| WORKDIR="${GITHUB_WORKSPACE}" | ||
| else | ||
| export WORKDIR="/github/workspace" | ||
| fi | ||
|
|
||
| # if project is mounted on WORKDIR then build, else restart in container | ||
| if [[ -x "${WORKDIR}/${BASENAME}" ]]; then | ||
| # container environment defines BUILD_ENVIRONMENT=ziti-builder-docker | ||
| if [[ "${BUILD_ENVIRONMENT:-}" == "ziti-builder-docker" ]]; then | ||
| echo "INFO: running in ziti-builder container" | ||
| set_git_safe_dirs "${WORKDIR}" | ||
| else | ||
| echo "ERROR: not running in ziti-builder container" >&2 | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo -e "INFO: project not mounted on ${WORKDIR}, re-running in container"\ | ||
| "\nINFO: 'docker run --user ${UID} --volume ${BASEDIR}:${WORKDIR} openziti/ziti-builder ${WORKDIR}/${BASENAME} ${*}'" | ||
| exec docker run \ | ||
| --rm \ | ||
| --user "${UID}" \ | ||
| --volume "${BASEDIR}:${WORKDIR}" \ | ||
| --platform "linux/amd64" \ | ||
| openziti/ziti-builder \ | ||
| "${WORKDIR}/${BASENAME}" "${@}" | ||
| fi | ||
| } | ||
|
|
||
| function main() { | ||
| echo "INFO: GIT_DISCOVERY_ACROSS_FILESYSTEM=${GIT_DISCOVERY_ACROSS_FILESYSTEM:-}" | ||
| echo "INFO: WORKDIR=${PWD}" | ||
| echo "INFO: $(git --version)" | ||
| echo "INFO: GIT_CONFIG_GLOBAL=${GIT_CONFIG_GLOBAL:-}" | ||
| # use this value to detect whether any options were passed so we can warn if | ||
| # they're being ignored when an override command is sent at the same time | ||
| : "${OPTS:=0}" | ||
|
|
||
| while getopts 'c::p:t:' OPT; do | ||
| case "${OPT}" in | ||
| c) CMAKE_CONFIG="${OPTARG}" | ||
| OPTS=1 | ||
| ;; | ||
| p) CMAKE_PRESET="${OPTARG}" | ||
| OPTS=1 | ||
| ;; | ||
| t) CMAKE_TARGET="${OPTARG}" | ||
| OPTS=1 | ||
| if [[ ${CMAKE_TARGET} == package ]]; then | ||
| BUILD_DIST_PACKAGES=ON | ||
| fi | ||
| ;; | ||
| *) echo "ERROR: invalid option: ${OPT}" >&2 | ||
| return 1 | ||
| ;; | ||
| esac | ||
| done | ||
| shift $((OPTIND-1)) | ||
| # if args then run them, else clean build output dir and build default target | ||
| if (( $# )); then | ||
| if (( OPTS )); then | ||
| echo "WARN: ignoring options because override command is present" >&2 | ||
| fi | ||
| exec "${@}" | ||
| else | ||
| [[ -d ./build ]] && rm -rf ./build | ||
| cmake \ | ||
| -E make_directory \ | ||
| ./build | ||
| cmake \ | ||
| --preset "${CMAKE_PRESET:-ci-linux-x64}" \ | ||
| -DCMAKE_BUILD_TYPE="${CMAKE_CONFIG:-Release}" \ | ||
| -DBUILD_DIST_PACKAGES="${BUILD_DIST_PACKAGES:-OFF}" \ | ||
| -DVCPKG_OVERLAY_PORTS="./vcpkg-overlays/linux-syslibs/ubuntu18" \ | ||
| -S . \ | ||
| -B ./build | ||
| cmake \ | ||
| --build ./build \ | ||
| --config "${CMAKE_CONFIG:-Release}" \ | ||
| --target "${CMAKE_TARGET:-bundle}" \ | ||
| --verbose | ||
| fi | ||
| } | ||
|
|
||
| # set global WORKDIR | ||
| set_workspace "${@}" | ||
|
|
||
| # run main() in WORKDIR | ||
| cd "${WORKDIR}" | ||
| main "${@}" |