Skip to content

Commit d2b889f

Browse files
author
Levent KARAGÖL
committed
Github Action .yml files have been updated
1 parent 39ae319 commit d2b889f

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/linux-aarch64.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,18 @@ jobs:
2424
docker run --name mycontainer -d -t --platform linux/arm64 ubuntu:22.04 tail -f /dev/null
2525
2626
# Prepare the environment inside the container
27-
docker exec mycontainer bash -c "apt-get update && apt-get install -y build-essential g++ gcc make cmake pkg-config git wget curl zip unzip tar ninja-build"
28-
docker exec mycontainer bash -c "git clone https://github.com/microsoft/vcpkg.git /opt/vcpkg && /opt/vcpkg/bootstrap-vcpkg.sh && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg"
29-
30-
# Set environment variable required by vcpkg on ARM platforms
31-
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1"
27+
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1 && apt-get update && apt-get install -y build-essential g++ gcc make cmake pkg-config git wget curl zip unzip tar ninja-build"
28+
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1 && git clone https://github.com/microsoft/vcpkg.git /opt/vcpkg && /opt/vcpkg/bootstrap-vcpkg.sh && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg"
3229
3330
# Copy project files into the container
3431
docker cp . mycontainer:/root/libcpp-http-client
3532
3633
# Run CMake and build inside the container
37-
docker exec mycontainer bash -c "cd /root/libcpp-http-client && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake"
38-
docker exec mycontainer bash -c "cd /root/libcpp-http-client && cmake --build build --config Release"
34+
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1 && cd /root/libcpp-http-client && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake"
35+
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1 && cd /root/libcpp-http-client && cmake --build build --config Release"
3936
4037
# Run tests
41-
docker exec mycontainer bash -c "cd /root/libcpp-http-client/build && ./test/test"
38+
docker exec mycontainer bash -c "export VCPKG_FORCE_SYSTEM_BINARIES=1 && cd /root/libcpp-http-client/build && ./test/test"
4239
4340
# Stop the container
4441
docker stop mycontainer

.github/workflows/macos.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v3
1616
- name: Install Xcode CLI tools
1717
run: |
18-
xcode-select --install || true
18+
xcode-select --install
1919
- name: Install prerequisites
2020
run: |
2121
brew update
@@ -31,8 +31,7 @@ jobs:
3131
brew install vcpkg
3232
- name: Setup vcpkg environment
3333
run: |
34-
export VCPKG_ROOT=$(brew --prefix vcpkg)
35-
echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
34+
echo "VCPKG_ROOT=$(brew --prefix vcpkg)" >> $GITHUB_ENV
3635
vcpkg integrate install
3736
- name: Clone project repository
3837
run: |

0 commit comments

Comments
 (0)