Merge branch 'main' into user/ashdhin/IssueTemplateRegressionCheckbox

awslabs · Oct 25, 2024 · b1d8dc1 · b1d8dc1
2 parents 934ecbc + ad7d9de
commit b1d8dc1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         ini-values: xdebug.overload_var_dump=0, memory_limit=4G, phar.readonly=false
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -68,7 +68,7 @@ jobs:
         ini-values: xdebug.overload_var_dump=0, memory_limit=4G, phar.readonly=false
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -104,16 +104,15 @@ jobs:
       matrix:
         arch: [x64]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - id: setup-php-sdk
-      uses: cmb69/setup-php-sdk@v0.6
+      uses: php/setup-php-sdk@v0.10
       with:
         version: '8.0'
         arch: ${{ matrix.arch }}
         ts: ts
-        deps: openssl
     - uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{ matrix.arch }}
@@ -175,7 +174,7 @@ jobs:
         php-version: '8.0'
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

diff --git a/Makefile.frag b/Makefile.frag
@@ -1,7 +1,7 @@
 
 INT_DIR=$(builddir)/build/install
 CMAKE_BUILD_DIR=$(builddir)/cmake_build
-GENERATE_STUBS=$(shell expr `php --version | head -1 | cut -f 2 -d' '` \>= 7.1)
+GENERATE_STUBS=$(shell expr `$(PHP_EXECUTABLE) --version | head -1 | cut -f 2 -d' '` \>= 7.1)
 
 CMAKE = cmake3
 ifeq (, $(shell which cmake3))
@@ -58,17 +58,18 @@ extension: $(builddir)/ext/awscrt.lo
 # Force the crt object target to depend on the CRT static library
 $(builddir)/ext/awscrt.lo: $(builddir)/ext/awscrt.c
 
-$(builddir)/ext/awscrt.c: $(CMAKE_BUILD_DIR)/aws-crt-ffi-static/libaws-crt-ffi.a $(builddir)/ext/api.h $(builddir)/ext/awscrt_arginfo.h
+$(builddir)/ext/awscrt.c: $(CMAKE_BUILD_DIR)/aws-crt-ffi-static/libaws-crt-ffi.a $(srcdir)/ext/api.h $(srcdir)/ext/awscrt_arginfo.h
 
-$(builddir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php
+$(srcdir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php
 ifeq ($(GENERATE_STUBS),1)
 	# generate awscrt_arginfo.h
-	mkdir -p $(builddir)/ext && php $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php
+	$(PHP_EXECUTABLE) $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php
 endif
 
 # transform/install api.h from FFI lib
 $(srcdir)/ext/api.h: $(srcdir)/crt/aws-crt-ffi/src/api.h
-	php $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h
+	# generate api.h
+	$(PHP_EXECUTABLE) $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/ext/api.h
 
 # install api.h to ext/ as well
 $(builddir)/ext/api.h : $(srcdir)/ext/api.h

diff --git a/config.m4 b/config.m4
@@ -26,5 +26,6 @@ if test "$PHP_AWSCRT" != "no"; then
     # Sources for the PHP extension itself
     AWSCRT_SOURCES=ext/awscrt.c
     PHP_NEW_EXTENSION(awscrt, $AWSCRT_SOURCES, $ext_shared)
+    PHP_ADD_BUILD_DIR($ext_builddir/ext)
     PHP_ADD_MAKEFILE_FRAGMENT
 fi
diff --git a/crt/aws-crt-ffi b/crt/aws-crt-ffi
diff --git a/ext/php_aws_crt.h b/ext/php_aws_crt.h
@@ -37,7 +37,7 @@
 #define AWS_PHP_AT_LEAST_7 (ZEND_EXTENSION_API_NO >= AWS_PHP_EXTENSION_API_7_0)
 #define AWS_PHP_AT_LEAST_7_2 (ZEND_EXTENSION_API_NO >= AWS_PHP_EXTENSION_API_7_2)
 
-#define PHP_AWSCRT_VERSION "1.2.3"
+#define PHP_AWSCRT_VERSION "1.2.7"
 
 ZEND_BEGIN_MODULE_GLOBALS(awscrt)
 long log_level;
+39 −24		.github/workflows/ci.yml
+5 −7		.github/workflows/lint.yml
+25 −27		CMakeLists.txt
+3 −0		aws-crt-sys/src/lib.rs
+21 −0		aws-crt-sys/tests/lib.rs
+1 −1		crt/aws-c-auth
+1 −1		crt/aws-c-cal
+1 −1		crt/aws-c-common
+1 −1		crt/aws-c-compression
+1 −1		crt/aws-c-event-stream
+1 −1		crt/aws-c-http
+1 −1		crt/aws-c-io
+1 −1		crt/aws-c-sdkutils
+1 −1		crt/aws-checksums
+1 −1		crt/aws-lc
+1 −1		crt/s2n
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −0		src/api.h
+6 −18		src/crc.c