diff --git a/.github/workflows/build_win.yml b/.github/workflows/build.yml similarity index 54% rename from .github/workflows/build_win.yml rename to .github/workflows/build.yml index 0ef71c1..3454e06 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: windows-latest +name: build concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -11,7 +11,32 @@ on: branches: [ master ] jobs: - build: + ubuntu: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: "Build/Test" + run: | + curl -fL --retry 3 --retry-delay 2 -o mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix + chmod +x mkn + KLOG=3 ./mkn clean build run -dtOp test -a "-std=c++20 -fPIC" -l -pthread + + macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + + - name: "Build/Test" + env: + MKN_LIB_LINK_LIB: 1 + run: | + set -ex + export SSL_DIR=$(dirname $(dirname $(find /opt/homebrew/Cellar/openssl@3 | grep "libssl\.a"))) + curl -fL --retry 3 --retry-delay 2 -o mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx && chmod +x mkn + KLOG=3 ./mkn clean build run -dtOp test -a "-std=c++20 -fPIC" -b "${SSL_DIR}/include" -B "${SSL_DIR}/lib" + + windows: runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -34,4 +59,4 @@ jobs: bash -c "set -ex; python3 -m pip install wheel -U && python3 -m pip install conan -U && python3 -m conans.conan profile detect" bash -c "mkdir -p /c/Users/runneradmin/.conan && cp conan_remotes.json /c/Users/runneradmin/.conan/remotes.json" bash -c "curl -Lo mkn.exe https://github.com/mkn/mkn/releases/download/latest/mkn.exe" - bash -c 'KLOG=3 ./mkn clean build -dtOp test -a "-EHsc -std:c++17"' + bash -c 'KLOG=3 ./mkn clean build -dtOp test -a "-EHsc -std:c++20"' diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml deleted file mode 100644 index 20e5e57..0000000 --- a/.github/workflows/build_nix.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: ubuntu-latest - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: "Build/Test" - run: | - curl -fL --retry 3 --retry-delay 2 -o mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix - chmod +x mkn - KLOG=3 ./mkn clean build run -dtOp test -a "-std=c++17 -fPIC" -l -pthread diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml deleted file mode 100644 index b93b2de..0000000 --- a/.github/workflows/build_osx.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: macos-latest - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - - name: "Build/Test" - env: - MKN_LIB_LINK_LIB: 1 - run: | - set -ex - export SSL_DIR=$(dirname $(dirname $(find /opt/homebrew/Cellar/openssl@3 | grep "libssl\.a"))) - curl -fL --retry 3 --retry-delay 2 -o mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx && chmod +x mkn - KLOG=3 ./mkn clean build run -dtOp test -a "-std=c++17 -fPIC" -b "${SSL_DIR}/include" -B "${SSL_DIR}/lib" diff --git a/src/any/http/request.cpp b/src/any/http/request.cpp index 1ef76e6..1ebb2bb 100644 --- a/src/any/http/request.cpp +++ b/src/any/http/request.cpp @@ -83,7 +83,7 @@ std::string mkn::ram::http::_1_1GetRequest::toString() const { std::stringstream ss; ss << method() << " /" << _path; if (atts.size() > 0) ss << "?"; - for (std::pair const& p : atts) ss << p.first << "=" << p.second << "&"; + for (auto const& p : atts) ss << p.first << "=" << p.second << "&"; if (atts.size() > 0) ss.seekp(-1, ss.cur); ss << " " << version(); ss << "\r\nHost: " << _host;