fixup! ci: test windows builds

Author: bavshin-f5

.github/workflows/nginx.yaml

@@ -42,6 +42,18 @@ env:
     --with-openssl=objs/lib/openssl
     --with-openssl-opt="no-asm no-module no-tests -D_WIN32_WINNT=0x0601"
 
+  NGX_CONFIGURE_DYNAMIC_MODULES: >-
+    --add-dynamic-module=${{ github.workspace }}/examples
+  NGX_CONFIGURE_STATIC_MODULES: >-
+    --add-module=${{ github.workspace }}/examples
+
+  NGX_TEST_FILES: examples/t
+  NGX_TEST_GLOBALS_DYNAMIC: >-
+    load_module ${{ github.workspace }}/nginx/objs/ngx_http_async_module.so;
+    load_module ${{ github.workspace }}/nginx/objs/ngx_http_awssigv4_module.so;
+    load_module ${{ github.workspace }}/nginx/objs/ngx_http_curl_module.so;
+    load_module ${{ github.workspace }}/nginx/objs/ngx_http_upstream_custom_module.so;
+
   OPENSSL_VERSION: '3.0.16'
   PCRE2_VERSION: '10.45'
   ZLIB_VERSION: '1.3.1'
@@ -86,9 +98,11 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            nginx/objs/ngx_rust_examples
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
+            nginx/objs/**/CACHEDIR.TAG
+            nginx/objs/**/ngx-debug
+            nginx/objs/**/ngx-release
+          key: ${{ runner.os }}-nginx-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-nginx-
 
       - name: Update configure arguments
         if: matrix.nginx-ref != 'stable-1.24'
@@ -102,22 +116,16 @@ jobs:
         run: |
           ${NGX_CONFIGURE_CMD} \
               ${NGX_CONFIGURE_UNIX} \
-              --add-module=${{ github.workspace }}/examples
+              ${NGX_CONFIGURE_STATIC_MODULES}
 
       - name: Configure nginx with dynamic modules
         if: matrix.module != 'static'
         working-directory: nginx
-        env:
-          TEST_NGINX_GLOBALS: >-
-            load_module ${{ github.workspace }}/nginx/objs/ngx_http_async_module.so;
-            load_module ${{ github.workspace }}/nginx/objs/ngx_http_awssigv4_module.so;
-            load_module ${{ github.workspace }}/nginx/objs/ngx_http_curl_module.so;
-            load_module ${{ github.workspace }}/nginx/objs/ngx_http_upstream_custom_module.so;
         run: |
           ${NGX_CONFIGURE_CMD} \
               ${NGX_CONFIGURE_UNIX} \
-              --add-dynamic-module=${{ github.workspace }}/examples
-          echo "TEST_NGINX_GLOBALS=$TEST_NGINX_GLOBALS" >> $GITHUB_ENV
+              ${NGX_CONFIGURE_DYNAMIC_MODULES}
+          echo TEST_NGINX_GLOBALS="$NGX_TEST_GLOBALS_DYNAMIC" >> "$GITHUB_ENV"
 
       - name: Build nginx
         working-directory: nginx
@@ -130,7 +138,7 @@ jobs:
           TEST_NGINX_MODULES: ${{ github.workspace }}/nginx/objs
           TEST_NGINX_VERBOSE: 1
         run: |
-          prove -j$(nproc) --state=save examples/t || prove -v --state=failed
+          prove -j$(nproc) --state=save ${NGX_TEST_FILES} || prove -v --state=failed
 
   windows:
     runs-on: windows-2022
@@ -171,19 +179,21 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            nginx/objs/ngx_rust_examples
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
+            nginx/objs/**/CACHEDIR.TAG
+            nginx/objs/**/ngx-debug
+            nginx/objs/**/ngx-release
+          key: ${{ runner.os }}-nginx-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-nginx-
 
       - name: Prepare build environment
         shell: bash
         working-directory: nginx
         run: |
           # Disable dynamic lookup of WSAPoll(); it crashes if the symbol is already imported by
-          # Rust stdib.
+          # Rust stdlib.
           sed 's/\(_WIN32_WINNT\s*\) 0x0501/\1 0x0601/' -i src/os/win32/ngx_win32_config.h
 
-          echo "VCVARSALL=$('C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" \
+          echo VCVARSALL="$('C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" \
               >> "$GITHUB_ENV"
 
           mkdir -p $TEMP
@@ -208,7 +218,7 @@ jobs:
           bash.exe ^
               %NGX_CONFIGURE_CMD% ^
               %NGX_CONFIGURE_WINDOWS% ^
-              --add-module=${{ github.workspace }}/examples
+              %NGX_CONFIGURE_STATIC_MODULES%
           nmake -f objs/Makefile
 
       - name: Run tests
@@ -218,4 +228,4 @@ jobs:
           TEST_NGINX_BINARY: "${{ github.workspace }}\\nginx\\objs\\nginx.exe"
           TEST_NGINX_VERBOSE: 1
         run: |
-          prove --state=save examples/t || prove -v --state=failed
+          prove --state=save %NGX_TEST_FILES% || prove -v --state=failed