Skip to content

Fix package-build workflow to support different toolchains #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AhmedBM merged 9 commits into from
Dec 4, 2025
Merged

Fix package-build workflow to support different toolchains #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
440ca2c
Fix package-build workflow to support different toolchains
AhmedBM Dec 3, 2025
151b4b4
fix bash syntax
AhmedBM Dec 3, 2025
d5574d6
Fix bash quoting
AhmedBM Dec 3, 2025
cd0c0aa
fixed quoting
AhmedBM Dec 3, 2025
6729d6e
addressed comments - changed to bash array syntax
AhmedBM Dec 3, 2025
b8f131f
Added echo to debug cmake args
AhmedBM Dec 3, 2025
07b8e3d
reverted back to simple strings
AhmedBM Dec 4, 2025
d161c01
Fixing bash quoting
AhmedBM Dec 4, 2025
a74c4fa
modified container-exec to accept stdin
AhmedBM Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/actions/container-exec/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@ runs:
steps:
- id: execute
run: |
docker exec ${{ inputs.container }} bash -c "cd ${{ inputs.working-directory }}; ${{ inputs.cmd }}"
docker exec -i ${{ inputs.container }} bash -s -- "${{ inputs.working-directory }}" <<'EOFSCRIPT'
cd "$1"
${{ inputs.cmd }}
EOFSCRIPT
shell: bash
15 changes: 11 additions & 4 deletions .github/workflows/package-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,22 @@ jobs:
container: ${{ steps.container.outputs.id }}
working-directory: ${{ env.MOUNT }}/build
cmd: |
(cd ../external/vcpkg && sed -e "s/\"2\\.7\\.4\"/\"1\\.0\\.0\"/g" -i scripts/vcpkg-tools.json && ./bootstrap-vcpkg.sh)
if [ "${{ inputs.machine-config }}" = "true" ]; then
cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DVCPKG_OVERLAY_TRIPLETS=../src/triplets -DVCPKG_TARGET_TRIPLET=x64-linux-gcc5 -DVCPKG_OVERLAY_PORTS=../src/ports-overlay
cmake_args="-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}"
elif [ "${{ inputs.build-fuzzers }}" = "true" ]; then
cmake ../src -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER='/usr/bin/clang' -DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DTWEAK_VERSION='${{ steps.version.outputs.tweak }}' -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=OFF -DBUILD_MODULETEST=OFF -DBUILD_SAMPLES=OFF -Duse_default_uuid=ON -DBUILD_ADAPTERS=ON -DBUILD_FUZZER=ON
cmake_args="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER='/usr/bin/clang' -DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DTWEAK_VERSION='${{ steps.version.outputs.tweak }}' -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=OFF -DBUILD_MODULETEST=OFF -DBUILD_SAMPLES=OFF -Duse_default_uuid=ON -DBUILD_ADAPTERS=ON -DBUILD_FUZZER=ON"
else
cmake ../src -DCMAKE_C_COMPILER='/usr/bin/gcc' -DCMAKE_CXX_COMPILER='/usr/bin/g++' -DCMAKE_BUILD_TYPE='${{ env.BUILD_TYPE }}' -DTWEAK_VERSION='${{ steps.version.outputs.tweak }}' -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=OFF -DBUILD_MODULETEST=ON -DBUILD_SAMPLES=OFF -Duse_default_uuid=ON -DBUILD_ADAPTERS=ON
cmake_args="-DCMAKE_C_COMPILER='/usr/bin/gcc' -DCMAKE_CXX_COMPILER='/usr/bin/g++' -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DTWEAK_VERSION='${{ steps.version.outputs.tweak }}' -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=OFF -DBUILD_MODULETEST=ON -DBUILD_SAMPLES=OFF -Duse_default_uuid=ON -DBUILD_ADAPTERS=ON"
fi

# For targets rhel-7, ubuntu-14.04 and centos-7 use GCC 5.5 toolchain
if [ "${{ inputs.target }}" = "rhel-7" ] || [ "${{ inputs.target }}" = "ubuntu-14.04" ] || [ "${{ inputs.target }}" = "centos-7" ]; then
cmake_args="$cmake_args -DVCPKG_OVERLAY_TRIPLETS='../src/triplets' -DVCPKG_TARGET_TRIPLET='x64-linux-gcc5' -DVCPKG_OVERLAY_PORTS='../src/ports-overlay'"
fi

echo "CMake arguments: $cmake_args"
cmake ../src $cmake_args

- name: Build Azure OSConfig
uses: ./.github/actions/container-exec
with:
Expand Down
Loading