This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-php.git
The following commit(s) were added to refs/heads/master by this push:
new bca2814 Update NOTICE (#103)
bca2814 is described below
commit bca2814bc3db6a2340d5ae7effa6ae10f32d912a
Author: jmjoy <jm...@apache.org>
AuthorDate: Thu Jan 18 11:03:13 2024 +0800
Update NOTICE (#103)
---
.github/workflows/pecl.yml | 2 +-
.github/workflows/rust.yml | 24 ++++++++++++++++--------
NOTICE | 2 +-
docker-compose.yml | 7 ++++++-
docker/Dockerfile | 4 ++--
5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/pecl.yml b/.github/workflows/pecl.yml
index 4384173..1e29d3e 100644
--- a/.github/workflows/pecl.yml
+++ b/.github/workflows/pecl.yml
@@ -51,7 +51,7 @@ jobs:
- macos-12
version:
- php: "8.2"
- swoole: "5.0.0"
+ swoole: "5.1.1"
option:
- 'enable-cargo-debug=\"no\" enable-kafka-reporter=\"no\"'
- 'enable-cargo-debug=\"no\" enable-kafka-reporter=\"yes\"'
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index eaa2b12..10a1e66 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -51,7 +51,8 @@ jobs:
matrix:
os:
- ubuntu-20.04
- - macos-12
+ # TODO Temporarily remove macos and wait for the docker container's
connection refused problem to be resolved.
+ # - macos-12
flag:
# Many composer dependencies need PHP 7.2+
- php_version: "7.2"
@@ -75,23 +76,23 @@ jobs:
enable_zend_observer: "On"
cargo_features: ""
- php_version: "8.1"
- swoole_version: "5.0.0"
+ swoole_version: "5.1.1"
enable_zend_observer: "Off"
cargo_features: ""
- php_version: "8.1"
- swoole_version: "5.0.0"
+ swoole_version: "5.1.1"
enable_zend_observer: "On"
cargo_features: ""
- php_version: "8.2"
- swoole_version: "5.0.0"
+ swoole_version: "5.1.1"
enable_zend_observer: "Off"
cargo_features: ""
- php_version: "8.2"
- swoole_version: "5.0.0"
+ swoole_version: "5.1.1"
enable_zend_observer: "On"
cargo_features: ""
- php_version: "8.2"
- swoole_version: "5.0.0"
+ swoole_version: "5.1.1"
enable_zend_observer: "On"
cargo_features: "--features kafka-reporter"
@@ -188,9 +189,13 @@ jobs:
#
https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+ colima list
+
# Build mixture for cargo test.
- name: Docker compose
- run: docker compose up -d --wait
+ run: |
+ docker compose up -d --wait
+ docker compose ps
# Try cargo test.
- name: Cargo test
@@ -207,7 +212,9 @@ jobs:
# Rebuild the mixture when cargo test failed.
- name: Docker compose restart
if: steps.cargo-test-step.outcome != 'success'
- run: docker compose restart
+ run: |
+ docker compose restart
+ docker compose ps
# Delay before retry.
- name: Delay
@@ -228,6 +235,7 @@ jobs:
- name: View logs
if: always()
run: |
+ docker compose ps
cat /tmp/*.log
fmt:
diff --git a/NOTICE b/NOTICE
index c68c699..04d6ba5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache SkyWalking
-Copyright 2017-2023 The Apache Software Foundation
+Copyright 2017-2024 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/docker-compose.yml b/docker-compose.yml
index 228b29d..d4a7985 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,12 +26,17 @@ services:
retries: 10
mysql:
- image: mysql:5.7.39
+ image: mysql:5.7.42-debian
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=skywalking
+ healthcheck:
+ test: [ "CMD", "mysqlcheck", "-h127.0.0.1", "-P3306", "-uroot",
"-ppassword", "--all-databases" ]
+ interval: 10s
+ timeout: 5s
+ retries: 10
redis:
image: bitnami/redis:7.0.4
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7205614..ba68d0e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,7 +20,7 @@ ARG SKYWALKING_AGENT
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
- RUST_VERSION=1.64.0
+ RUST_VERSION=1.65.0
RUN apt update \
@@ -40,4 +40,4 @@ LABEL
org.opencontainers.image.source=https://github.com/apache/skywalking-php
LABEL org.opencontainers.image.description="The PHP Agent for Apache
SkyWalking, which provides the native tracing abilities for PHP project."
LABEL org.opencontainers.image.licenses="Apache 2.0"
COPY --from=builder
/usr/local/etc/php/conf.d/docker-php-ext-skywalking_agent.ini
/usr/local/etc/php/conf.d/
-COPY --from=builder
/usr/local/lib/php/extensions/no-debug-non-zts-20210902/skywalking_agent.so
/usr/local/lib/php/extensions/no-debug-non-zts-20210902/
\ No newline at end of file
+COPY --from=builder
/usr/local/lib/php/extensions/no-debug-non-zts-20210902/skywalking_agent.so
/usr/local/lib/php/extensions/no-debug-non-zts-20210902/
