Skip to content

Commit 92a2f22

Browse files
MariusNiMariusNi
authored
Revert "Added Telemetry using 1DS C++ SDK (#1191)"
This reverts commit 206c1a3.
1 parent 206c1a3 commit 92a2f22

File tree

109 files changed

+346
-2894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+346
-2894
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,24 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y instal
99
rapidjson-dev \
1010
uuid-dev \
1111
wget
12+
13+
ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.31.8"
14+
15+
# Optionally install the cmake for vcpkg
16+
COPY ./reinstall-cmake.sh /tmp/
17+
18+
RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
19+
chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
20+
fi \
21+
&& rm -f /tmp/reinstall-cmake.sh
22+
23+
# Install vcpkg
24+
RUN git clone https://github.com/microsoft/vcpkg.git --branch ${VCPKG_REF} --single-branch /vcpkg
25+
COPY ./vcpkg.json /vcpkg/
26+
COPY ./vcpkg-configuration.json /vcpkg/
27+
WORKDIR /vcpkg
28+
RUN ./bootstrap-vcpkg.sh && ./vcpkg install && ./vcpkg integrate install
29+
ENV VCPKG_ROOT /vcpkg
30+
31+
# Base container pre-defines VCPKG_ROOT in /etc/bash.bashrc
32+
sed -i '/VCPKG_ROOT/d' /etc/bash.bashrc

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
]
2222
}
2323
},
24+
"containerEnv": { "VCPKG_ROOT": "/vcpkg" },
2425
"remoteUser": "root"
2526
}

‎.devcontainer/reinstall-cmake.sh‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/usr/bin/env bash
2+
#-------------------------------------------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
5+
#-------------------------------------------------------------------------------------------------------------
6+
#
7+
set -e
8+
9+
CMAKE_VERSION=${1:-"none"}
10+
11+
if [ "${CMAKE_VERSION}" = "none" ]; then
12+
echo "No CMake version specified, skipping CMake reinstallation"
13+
exit 0
14+
fi
15+
16+
# Cleanup temporary directory and associated files when exiting the script.
17+
cleanup() {
18+
EXIT_CODE=$?
19+
set +e
20+
if [[ -n "${TMP_DIR}" ]]; then
21+
echo "Executing cleanup of tmp files"
22+
rm -Rf "${TMP_DIR}"
23+
fi
24+
exit $EXIT_CODE
25+
}
26+
trap cleanup EXIT
27+
28+
29+
echo "Installing CMake..."
30+
apt-get -y purge --auto-remove cmake
31+
mkdir -p /opt/cmake
32+
33+
architecture=$(dpkg --print-architecture)
34+
case "${architecture}" in
35+
arm64)
36+
ARCH=aarch64 ;;
37+
amd64)
38+
ARCH=x86_64 ;;
39+
*)
40+
echo "Unsupported architecture ${architecture}."
41+
exit 1
42+
;;
43+
esac
44+
45+
CMAKE_BINARY_NAME="cmake-${CMAKE_VERSION}-linux-${ARCH}.sh"
46+
CMAKE_CHECKSUM_NAME="cmake-${CMAKE_VERSION}-SHA-256.txt"
47+
TMP_DIR=$(mktemp -d -t cmake-XXXXXXXXXX)
48+
49+
echo "${TMP_DIR}"
50+
cd "${TMP_DIR}"
51+
52+
curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_BINARY_NAME}" -O
53+
curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_CHECKSUM_NAME}" -O
54+
55+
sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
56+
sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
57+
58+
ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
59+
ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest

‎.github/actions/container-run/action.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ inputs:
1616
description: The container tag.
1717
required: false
1818
default: latest
19-
args:
20-
description: Additional arguments to pass to the container.
21-
required: false
22-
default: ""
2319

2420
outputs:
2521
id:
@@ -53,7 +49,7 @@ runs:
5349
container_name_tag="${name}:${tag}"
5450
fi
5551
echo "Running container ${container_name_tag}"
56-
id=$(docker run -di --privileged ${{ inputs.args }} -v ${{ inputs.mount }} "${container_name_tag}")
52+
id=$(docker run -di --privileged -v ${{ inputs.mount }} "${container_name_tag}")
5753
5854
echo Container ID: $id
5955
echo id=$id >> $GITHUB_OUTPUT

‎.github/test-matrix.json‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
[
2-
{"name":"almalinux-9","arch":"amd64","tag":"@sha256:457a85686d95bd324c1ddbdba43fccb79d8c127c11b1189941ccc913989461c5"},
3-
{"name":"amazonlinux-2","arch":"amd64","tag":"@sha256:5f78d184712b39087d4448d1fe04ffa6a4dbb6e5ff0e29cdef0eff1f3980cfd8"},
4-
{"name":"azurelinux-3","arch":"amd64","tag":"@sha256:6d8d1134816ee789c5579570d83671cd572ac0634a1ffdc04a0ef5471f8b0877"},
5-
{"name":"centos-7","arch":"amd64","tag":"@sha256:0e72fef7615ffd41db07a0cb4a2d989f74925bc49a546c719f7ccb857852108a"},
6-
{"name":"centos-8","arch":"amd64","tag":"@sha256:2fb02a9f8259b91ea938c003a845b7e9dc7150ea643bf8c1b6ae8bd4087d8706"},
7-
{"name":"debian-10","arch":"amd64","tag":"@sha256:a05ae3e90f16cd284e3c0c818420c2685c17f327c0e6a1967837573490a2a327"},
8-
{"name":"debian-11","arch":"amd64","tag":"@sha256:368dac89e858472de6435c86905c26749eb42e4a944b177b0df5c2dcb741b693"},
9-
{"name":"debian-12","arch":"amd64","tag":"@sha256:63a8712390f4aed657924706ed0c4ce1c37d4c5d5c189625a09785e00fceac62"},
10-
{"name":"debian-9","arch":"amd64","tag":"@sha256:7665a7e37457e59e3d240219230cf2a030aa9fe1a00e08a92b144ba8c383419e"},
11-
{"name":"mariner-2","arch":"amd64","tag":"@sha256:7080c3c0e03bf530e09ac94ae7f486e005534706cebe4df623f71de49d0f2904"},
12-
{"name":"oraclelinux-7","arch":"amd64","tag":"@sha256:0561e7c5d0ae0486450ad086bf3e25a69be721e52df1df63bd835972322fb1e4"},
13-
{"name":"oraclelinux-8","arch":"amd64","tag":"@sha256:1bf1d1622e5163d02c2066b15bd18294bf301a1df1d60318d7a396fc0e795b66"},
14-
{"name":"rhel-7","arch":"amd64","tag":"@sha256:5739b3749eea6af70f6a76ce092e9a3b1b2f8f8ed1b6002bade36c28e74426c4"},
15-
{"name":"rhel-8","arch":"amd64","tag":"@sha256:fd4b3005958abe0c8a3f9aee3be3604c9a778de80e89dd9d62b3c0864a701383"},
16-
{"name":"rhel-9","arch":"amd64","tag":"@sha256:7cfb079ea2887a9cc8a524f109873126a76684076bec13bbd87e139d8d053b78"},
17-
{"name":"rockylinux-9","arch":"amd64","tag":"@sha256:93c24f671cd27cfbf92a25177fbaa43fdf4a1da4911794ce771cb44bad096604"},
18-
{"name":"sles-15","arch":"amd64","tag":"@sha256:b633a6effbe084b5cf34f1e10995374feb61b0a366160c5e7a786237aeb877a8"},
19-
{"name":"ubuntu-18.04","arch":"amd64","tag":"@sha256:d0bf753624703349ad20886de2b7795caf46db005d5a5ece633aaa5aec7505f9"},
20-
{"name":"ubuntu-20.04","arch":"amd64","tag":"@sha256:31687451ce1b8f50f4f26884bd0947fb5d5dba8711c63601b14bc0b19cb5c6ca"},
21-
{"name":"ubuntu-22.04","arch":"amd64","tag":"@sha256:de2c11da255fa2c0ec39c9f56a53aaefbb4db97982e11c9487116551fc4ecae0"},
22-
{"name":"ubuntu-24.04","arch":"amd64","tag":"@sha256:f660171fcbb5ef1669303456c85b7a0f9fba447c2e35ae89953f9070200f5c15"}
2+
{ "name": "almalinux-9", "arch": "amd64", "tag": "@sha256:d2c6bd9f0eda3151c38f5c678b25124af1d34622de5757e690fe518ab613aec3" },
3+
{ "name": "amazonlinux-2", "arch": "amd64", "tag": "@sha256:651fcca7123d696d883d5e755723ae018dadb35284fd5d3ab29008b21e858bf6" },
4+
{ "name": "azurelinux-3", "arch": "amd64", "tag": "@sha256:029c9096b62a553eee7a6621eee36d77002effe3a2d7b8c9b7e8d59c49697cd3" },
5+
{ "name": "centos-7", "arch": "amd64", "tag": "@sha256:fca7046aa164e1cd5e8521bbd40dcf1f714fd8ee8a73e2d2d401ef459e3d6100" },
6+
{ "name": "centos-8", "arch": "amd64", "tag": "@sha256:3ed4e39b0524bc41b327c0aa4c3899f55febfc638d66668e4a6b5c175df892ee" },
7+
{ "name": "debian-10", "arch": "amd64", "tag": "@sha256:f35850f7627c3404c6a3a11443505ce6b80b9b6b437cd19ca67452ab4b77a2d4" },
8+
{ "name": "debian-11", "arch": "amd64", "tag": "@sha256:97c518527c76ad997bab15559d3640e7d2bf27eeab5eedc501546364e1dec311" },
9+
{ "name": "debian-12", "arch": "amd64", "tag": "@sha256:05a41d7ae8b496fa956965e93ad5217633604db00851e8dfabfe7981513c2c7d" },
10+
{ "name": "mariner-2", "arch": "amd64", "tag": "@sha256:7ac04b9368533f71127b977439f4b3a1576a1be3ec1fe444acf1216032c4ae2b" },
11+
{ "name": "oraclelinux-7", "arch": "amd64", "tag": "@sha256:77b4c9913d01397c540dd831e80aebf57fd4cdc48d5a6fcd652128db94718f0b" },
12+
{ "name": "oraclelinux-8", "arch": "amd64", "tag": "@sha256:2c05af2c8bea2b85108e85f0489f65d21df489f7addcb56ced1fc75bb4ce0897" },
13+
{ "name": "rhel-7", "arch": "amd64", "tag": "@sha256:35fc1d2dd889c6225acc000dde3d819417b68fec80e3f66a0768c0dbaf1ab490" },
14+
{ "name": "rhel-8", "arch": "amd64", "tag": "@sha256:36aa8a92ceea75f3408515b464d659ee129a30185a2abbbb2b52b1d7323ef422" },
15+
{ "name": "rhel-9", "arch": "amd64", "tag": "@sha256:b4b0dec958fb4e5eab499fd1cc5310bf8eb3b5ca316e0ff563bffd119ae136a5" },
16+
{ "name": "sles-15", "arch": "amd64", "tag": "@sha256:5dda8a77136f34be84cca6735872bf0ef5b2f34d41df8bb9317ec08317bcc559" },
17+
{ "name": "ubuntu-20.04", "arch": "amd64", "tag": "@sha256:d880441d800f0b5d9acece95c2a87ae0cbb9f2f35983024fd82d7e476840c33f" },
18+
{ "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:1398461e6a1f38940f10bf153ea0ea51e2a77d03de3d10e47aa9a1bb985b795f" },
19+
{ "name": "ubuntu-24.04", "arch": "amd64", "tag": "@sha256:ecf8fcb26175d413716d0a40b043e5d9685b9b2b895de590313ef6da7318bb6b" }
2320
]

‎.github/workflows/ci-gcovr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
matrix="$(cat <<'EOL'
2525
[
26-
{ "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6" }
26+
{ "name": "ubuntu-22.04", "arch": "amd64", "tag": "latest" }
2727
]
2828
EOL
2929
)"

‎.github/workflows/ci-sanitizers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
matrix="$(cat <<'EOL'
2525
[
26-
{ "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6" }
26+
{ "name": "ubuntu-22.04", "arch": "amd64", "tag": "latest" }
2727
]
2828
EOL
2929
)"

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,7 @@ jobs:
7070
cmd: |
7171
(cd external/vcpkg && sed -e "s/\"2\\.7\\.4\"/\"1\\.0\\.0\"/g" -i scripts/vcpkg-tools.json && ./bootstrap-vcpkg.sh)
7272
mkdir build && cd build
73-
if [ "${{ matrix.target.name }}" = "ubuntu-14.04" ]; then
74-
cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON -DVCPKG_OVERLAY_TRIPLETS=../src/triplets -DVCPKG_TARGET_TRIPLET=x64-linux-gcc5
75-
else
76-
cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON
77-
fi
73+
cmake ../src -DCMAKE_build-type=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON
7874
7975
- name: Build azure-osconfig
8076
uses: ./.github/actions/container-exec

‎.github/workflows/fuzzing-run.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
artifact: ${{ inputs.target }}-fuzzer
4040
package-type: ${{ inputs.package-type }}
4141
build-fuzzers: true
42-
container-tag: ${{ inputs.container-tag }}
4342

4443
fuzzer-execution:
4544
if: ${{ inputs.execute }}

‎.github/workflows/fuzzing.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
target:
1717
[
18-
{ os: ubuntu, version: 22.04, package-type: DEB, container-tag: '@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6' },
18+
{ os: ubuntu, version: 22.04, package-type: DEB },
1919
]
2020
arch: [amd64]
2121
with:
@@ -24,4 +24,3 @@ jobs:
2424
package-type: ${{ matrix.target.package-type }}
2525
timeout-seconds: 3600
2626
execute: ${{ contains(fromJSON('["workflow_dispatch", "schedule"]'), github.event_name) }}
27-
container-tag: ${{ matrix.target.container-tag }}

0 commit comments

Comments
 (0)