From 9b081c69246f2736107165387aec4948439f0589 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Tue, 22 Nov 2022 12:50:03 +0100 Subject: [PATCH 1/3] Set vcpkg to fixed version Signed-off-by: Johann Hoffmann --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f61a4ce..2552b7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ ARG DEBIAN_VERSION=11.5-slim ARG POCO_VERSION=poco-tip-v1 ARG CPPKAFKA_VERSION=tip-v1 +ARG VCPKG_VERSION=2022.11.14 FROM debian:$DEBIAN_VERSION AS build-base @@ -45,7 +46,7 @@ ADD overlays /owfms/overlays ADD cmake /owfms/cmake ADD src /owfms/src ADD .git /owfms/.git -RUN git clone https://github.com/microsoft/vcpkg && \ +RUN git clone --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg && \ ./vcpkg/bootstrap-vcpkg.sh && \ mkdir /vcpkg/custom-triplets && \ cp /vcpkg/triplets/x64-linux.cmake /vcpkg/custom-triplets/x64-linux.cmake && \ From 5e39f63fd2378ff8a95526424e0afdabd6b7328d Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Tue, 22 Nov 2022 14:16:39 +0100 Subject: [PATCH 2/3] Move ARG definition to avoid hitting build cache Signed-off-by: Johann Hoffmann --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2552b7a..cbba483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ ARG DEBIAN_VERSION=11.5-slim ARG POCO_VERSION=poco-tip-v1 ARG CPPKAFKA_VERSION=tip-v1 -ARG VCPKG_VERSION=2022.11.14 FROM debian:$DEBIAN_VERSION AS build-base @@ -46,6 +45,7 @@ ADD overlays /owfms/overlays ADD cmake /owfms/cmake ADD src /owfms/src ADD .git /owfms/.git +ARG VCPKG_VERSION=2022.11.14 RUN git clone --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg && \ ./vcpkg/bootstrap-vcpkg.sh && \ mkdir /vcpkg/custom-triplets && \ From a6e0cd453b711ab4e11a1ad683befd01860d62b4 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Fri, 25 Nov 2022 15:33:25 +0100 Subject: [PATCH 3/3] [WIFI-11419] Patch workflows with regard to deprecated Github actions commands (#73) * Update checkout action version and replace set-output commands Signed-off-by: Johann Hoffmann * Fix output variable assignment Signed-off-by: Johann Hoffmann Signed-off-by: Johann Hoffmann --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d3c357..d045c9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: DOCKER_REGISTRY_USERNAME: ucentral steps: - name: Checkout actions repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: Telecominfraproject/.github path: github @@ -58,11 +58,11 @@ jobs: - name: Get base branch name and set as output id: get_base_branch run: | - echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/}) - echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g') + echo "branch=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_OUTPUT + echo "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT - name: Checkout actions repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: Telecominfraproject/.github path: github @@ -87,7 +87,7 @@ jobs: - docker steps: - name: Checkout actions repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: Telecominfraproject/.github path: github