Skip to content

Commit

Permalink
Update NOTICE (#103)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmjoy authored Jan 18, 2024
1 parent 981dad9 commit bca2814
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pecl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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\"'
Expand Down
24 changes: 16 additions & 8 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -228,6 +235,7 @@ jobs:
- name: View logs
if: always()
run: |
docker compose ps
cat /tmp/*.log
fmt:
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -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/).
7 changes: 6 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
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/

0 comments on commit bca2814

Please sign in to comment.