Skip to content

Commit 438c113

Browse files
authored
Fix package-build workflow to support different toolchains (#1221)
1 parent a520291 commit 438c113

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/actions/container-exec/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@ runs:
1818
steps:
1919
- id: execute
2020
run: |
21-
docker exec ${{ inputs.container }} bash -c "cd ${{ inputs.working-directory }}; ${{ inputs.cmd }}"
21+
docker exec -i ${{ inputs.container }} bash -s -- "${{ inputs.working-directory }}" <<'EOFSCRIPT'
22+
cd "$1"
23+
${{ inputs.cmd }}
24+
EOFSCRIPT
2225
shell: bash

.github/workflows/package-build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,22 @@ jobs:
105105
container: ${{ steps.container.outputs.id }}
106106
working-directory: ${{ env.MOUNT }}/build
107107
cmd: |
108-
(cd ../external/vcpkg && sed -e "s/\"2\\.7\\.4\"/\"1\\.0\\.0\"/g" -i scripts/vcpkg-tools.json && ./bootstrap-vcpkg.sh)
109108
if [ "${{ inputs.machine-config }}" = "true" ]; then
110-
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
109+
cmake_args="-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}"
111110
elif [ "${{ inputs.build-fuzzers }}" = "true" ]; then
112-
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
111+
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"
113112
else
114-
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
113+
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"
115114
fi
116115
116+
# For targets rhel-7, ubuntu-14.04 and centos-7 use GCC 5.5 toolchain
117+
if [ "${{ inputs.target }}" = "rhel-7" ] || [ "${{ inputs.target }}" = "ubuntu-14.04" ] || [ "${{ inputs.target }}" = "centos-7" ]; then
118+
cmake_args="$cmake_args -DVCPKG_OVERLAY_TRIPLETS='../src/triplets' -DVCPKG_TARGET_TRIPLET='x64-linux-gcc5' -DVCPKG_OVERLAY_PORTS='../src/ports-overlay'"
119+
fi
120+
121+
echo "CMake arguments: $cmake_args"
122+
cmake ../src $cmake_args
123+
117124
- name: Build Azure OSConfig
118125
uses: ./.github/actions/container-exec
119126
with:

0 commit comments

Comments
 (0)