Merge branch 'main' into feature/sphinx-docs

Author: lexiforest

.github/workflows/build-and-test.yml

@@ -6,6 +6,8 @@ on:
       - main
       - feature/*
       - bugfix/*
+      - chore/*
+      - security/*
     tags:
       - "v*"
   pull_request:

.github/workflows/build-push-docker.yml .github/workflows/build-docker.yml.github/workflows/build-push-docker.yml renamed to .github/workflows/build-docker.yml

@@ -1,38 +1,40 @@
 name: Build for windows
 on:
+  workflow_call:
   push:
     branches:
       - main
       - feature/*
       - bugfix/*
-    tags:
-      - "v*"
+      - chore/*
+      - security/*
   pull_request:
     branches:
       - main
 
 permissions:
-  contents: write
+  contents: read
 
 env:
   ZLIB_COMMIT: 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851
   ZSTD_COMMIT: 794ea1b0afca0f020f4e57b6732332231fb23c70
   BROTLI_COMMIT: ed738e842d2fbdf2d6459e39267a633c4a9b2f5d
   BORINGSSL_COMMIT: 673e61fc215b178a90c0e67858bbf162c8158993
-  CURL_TAG: curl-8_14_1  # using tags is less secure, but easier to maintain
+  CURL_TAG: curl-8_15_0  # using tags is less secure, but easier to maintain
   NGHTTP2_COMMIT: 8f44147c385fb1ed93a6f39911eeb30279bfd2dd
-  NGHTTP3_TAG: v1.9.0
-  NGTCP2_TAG: v1.11.0
+  NGHTTP3_TAG: v1.15.0
+  NGTCP2_TAG: v1.20.0
 
 jobs:
   build-windows:
     name: Build windows binaries
-    runs-on: windows-latest
     strategy:
       matrix:
         include:
-          - { sys: vcvars64, env: x86_64 }
-          - { sys: vcvars32, env: i686 }
+          - { sys: vcvars64, env: x86_64, runner: windows-latest }
+          - { sys: vcvars32, env: i686, runner: windows-latest }
+          - { sys: vcvarsarm64, env: arm64, runner: windows-11-arm }
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: configure Pagefile
         uses: al-cheb/configure-pagefile-action@v1.3
@@ -41,10 +43,10 @@ jobs:
           maximum-size: 16GB
           disk-root: "C:"
 
-      - name: Install python 3.10
+      - name: Install python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Check out the repo
         uses: actions/checkout@v2
@@ -53,6 +55,14 @@ jobs:
         shell: cmd
         run: choco install nasm -y
 
+      - name: Install Ninja for Win-ARM64
+        shell: pwsh
+        if: matrix.os == 'windows-11-arm'
+        run: |
+          Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-winarm64.zip -OutFile ninja-winarm64.zip
+          Expand-Archive ninja-winarm64.zip -DestinationPath ninja
+          Copy-Item ninja\ninja.exe -Destination "C:\Windows\System32"
+
       - name: Fetch and patch deps
         shell: bash
         run: ./win/deps.sh
@@ -63,6 +73,8 @@ jobs:
       - name: Build
         shell: cmd
         run: ./win/build.bat ${{ matrix.sys }}
+        env:
+          DISABLE_ASM_ARM64: ${{ matrix.env == 'arm64' && 'true' || 'false' }}
 
       - name: Build tarball
         shell: bash
@@ -76,12 +88,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: libcurl-impersonate.${{ matrix.env }}-win32.tar.gz
+          name: artifacts.windows.${{ matrix.env }}
           path: ./libcurl-impersonate*.tar.gz
-
-      - name: Upload release files
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          prerelease: true
-          files: libcurl-impersonate-${{ github.head_ref || github.ref_name }}.${{ matrix.env }}-win32.tar.gz