Update GitHub workflow files

pichi-router · Apr 18, 2023 · 55dfb5c · 55dfb5c
1 parent 2dd445f
commit 55dfb5c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.conan/scripts/build.sh b/.conan/scripts/build.sh
@@ -75,6 +75,7 @@ copy_if_not_exists()
   local src="${recipes}/../profiles"
   local dst="$(conan config home)/profiles"
   local profile="$1"
+  mkdir -p "${dst}"
   if [ ! -f "${dst}/${profile}" ]; then
     cp -f "${src}/${profile}" "${dst}/${profile}"
   fi
@@ -181,7 +182,7 @@ build_for_windows()
     else
       args="${args} -s compiler.runtime=static"
     fi
-    args="${args} -s compiler.runtime_type=${build_type} $(generate_vs_runtime)"
+    args="${args} -s compiler.runtime_type=${build_type}"
   fi
   build ${args}
 }

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -12,4 +12,4 @@ jobs:
     with:
       image: ubuntu-22.04
       os: android
-      args: -r android-ndk/r25@ -l 33 -a armv8
+      args: -r android-ndk/r25c -l 33 -a armv8
diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml
@@ -27,8 +27,6 @@ jobs:
       - name: Install NASM for windows
         if: ${{ inputs.os == 'windows' }}
         run: choco install -y nasm
-      - name: Export Conan Recipe
-        run: sh .conan/scripts/export.sh -d new latest
       - name: Build Pichi Recipe
         run: >-
           sh .conan/scripts/build.sh

diff --git a/include/pichi/common/config.hpp.in b/include/pichi/common/config.hpp.in
@@ -27,6 +27,10 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif  // __GNUC__ >= 8
 
+#if __GNUC__ >= 10
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif  // __GNUC__ >= 10
+
 #cmakedefine DISABLE_GCC_IGNORED_ATTRIBUTES
 #ifdef DISABLE_GCC_IGNORED_ATTRIBUTES
 #pragma GCC diagnostic ignored "-Wignored-attributes"
@@ -54,7 +58,7 @@
 
 #ifdef CMAKE_INSTALL_PREFIX
 #define PICHI_PREFIX CMAKE_INSTALL_PREFIX
-#else  // CMAKE_INSTALL_PREFIX
+#else   // CMAKE_INSTALL_PREFIX
 #error "CMAKE_INSTALL_PREFIX not defined"
 #endif  // CMAKE_INSTALL_PREFIX
 

diff --git a/src/api/egress_manager.cpp b/src/api/egress_manager.cpp
@@ -3,6 +3,7 @@
 #include <iterator>
 #include <pichi/api/egress_manager.hpp>
 #include <pichi/common/asserts.hpp>
+#include <utility>
 
 using namespace std;
 

diff --git a/src/crypto/fingerprint.cpp b/src/crypto/fingerprint.cpp
@@ -33,14 +33,17 @@ void setupTlsFingerprint(::SSL_CTX* ctx)
       "ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:"
       "AES128-SHA:AES256-SHA";
 
-  static auto const ALPN = array{0x02_u8, 0x68_u8, 0x32_u8, 0x08_u8, 0x68_u8, 0x74_u8,
-                                 0x74_u8, 0x70_u8, 0x2f_u8, 0x31_u8, 0x2e_u8, 0x31_u8};
+  // static auto const ALPN = array{0x02_u8, 0x68_u8, 0x32_u8, 0x08_u8, 0x68_u8, 0x74_u8,
+  //  0x74_u8, 0x70_u8, 0x2f_u8, 0x31_u8, 0x2e_u8, 0x31_u8};
+  static auto const ALPN =
+      array{0x08_u8, 0x68_u8, 0x74_u8, 0x74_u8, 0x70_u8, 0x2f_u8, 0x31_u8, 0x2e_u8, 0x31_u8};
 
   static auto const ALGORITHMS =
       array{NID_sha256, EVP_PKEY_EC,      NID_sha256, EVP_PKEY_RSA_PSS, NID_sha256, EVP_PKEY_RSA,
             NID_sha384, EVP_PKEY_EC,      NID_sha384, EVP_PKEY_RSA_PSS, NID_sha384, EVP_PKEY_RSA,
             NID_sha512, EVP_PKEY_RSA_PSS, NID_sha512, EVP_PKEY_RSA};
 
+  ::SSL_CTX_set_permute_extensions(ctx, 1);
   ::SSL_CTX_set_grease_enabled(ctx, 1);
   ::SSL_CTX_enable_ocsp_stapling(ctx);
   ::SSL_CTX_set_cipher_list(ctx, CIPHER_SUITES);

diff --git a/src/net/http.cpp b/src/net/http.cpp
@@ -365,7 +365,7 @@ template <typename Stream> Endpoint HttpIngress<Stream>::readRemote(Yield yield)
      * relative_path specified;
      *     - relative_path will be forwarded without any change.
      */
-    auto target = req.target().to_string();
+    auto target = string{cbegin(req.target()), cend(req.target())};
     assertFalse(target.empty(), PichiError::BAD_PROTO, "Empty path");
     if (target[0] != '/') {
       // absolute_path specified, so convert it to relative one.