diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 83290ed..365d530 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -1,12 +1,23 @@ name: ASAN on: [push, pull_request] jobs: + auth: + runs-on: ubuntu-latest + name: Login to GitHub Container Registry + steps: + - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + vanilla: strategy: matrix: version: ["8.1", "8.2"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: ASAN, PHP v${{matrix.version}} steps: - name: Checkout @@ -19,6 +30,7 @@ jobs: version: ["8.1", "8.2"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: ASAN, PHP v${{matrix.version}}, opcache steps: - name: Checkout @@ -31,9 +43,10 @@ jobs: version: ["8.1", "8.2"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: ASAN, PHP v${{matrix.version}}, JIT steps: - name: Checkout uses: actions/checkout@v3 - name: Test parallel - run: docker compose run parallel-asan-${{matrix.version}} docker/parallel.test -d opcache.enable_cli=1 -d opcache.jit=function -d opcache.jit_buffer_size=32M --asan \ No newline at end of file + run: docker compose run parallel-asan-${{matrix.version}} docker/parallel.test -d opcache.enable_cli=1 -d opcache.jit=function -d opcache.jit_buffer_size=32M --asan diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8d4dea7..aa855f8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,6 +3,16 @@ on: [push, pull_request] env: NODE_COVERALLS_DEBUG: true jobs: + auth: + runs-on: ubuntu-latest + name: Login to GitHub Container Registry + steps: + - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + vanilla: strategy: matrix: @@ -10,6 +20,7 @@ jobs: build: ["gcov", "release"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: Linux, PHP v${{matrix.version}}, ${{matrix.build}} steps: - name: Checkout @@ -31,6 +42,7 @@ jobs: build: ["gcov", "release"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: Linux, PHP v${{matrix.version}}, ${{matrix.build}}, opcache steps: - name: Checkout @@ -52,6 +64,7 @@ jobs: build: ["gcov", "release"] if: success() || failure() runs-on: ubuntu-latest + needs: auth name: Linux, PHP v${{matrix.version}}, ${{matrix.build}}, JIT steps: - name: Checkout diff --git a/docker-compose.yml b/docker-compose.yml index 2020d51..d4d0fec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: } }, container_name: php-dbg-8.0, - image: parallelphp/php-dbg-8.0:8.0.24, + image: ghcr.io/krakjoe/php-dbg-8.0:8.0.24, profiles: [php-8.0,dbg], <<: [*dev, *parallel] } @@ -55,7 +55,7 @@ services: } }, container_name: php-gcov-8.0, - image: parallelphp/php-gcov-8.0:8.0.24, + image: ghcr.io/krakjoe/php-gcov-8.0:8.0.24, profiles: [php-8.0,gcov], <<: [*dev, *parallel] } @@ -70,7 +70,7 @@ services: } }, container_name: php-release-8.0, - image: parallelphp/php-release-8.0:8.0.24, + image: ghcr.io/krakjoe/php-release-8.0:8.0.24, profiles: [php-8.0,release], <<: [*dev, *parallel] } @@ -87,7 +87,7 @@ services: } }, container_name: parallel-dbg-8.0, - image: parallelphp/parallel-dbg-8.0:latest, + image: ghcr.io/krakjoe/parallel-dbg-8.0:latest, profiles: [parallel-8.0,dbg], <<: [*dev, *parallel] } @@ -103,7 +103,7 @@ services: } }, container_name: parallel-gcov-8.0, - image: parallelphp/parallel-gcov-8.0:latest, + image: ghcr.io/krakjoe/parallel-gcov-8.0:latest, profiles: [parallel-8.0,gcov], <<: [*dev, *parallel] } @@ -119,7 +119,7 @@ services: } }, container_name: parallel-release-8.0, - image: parallelphp/parallel-release-8.0:latest, + image: ghcr.io/krakjoe/parallel-release-8.0:latest, profiles: [parallel-8.0,release], <<: [*dev, *parallel] } @@ -135,7 +135,7 @@ services: } }, container_name: php-dbg-8.1, - image: parallelphp/php-dbg-8.1:8.1.11, + image: ghcr.io/krakjoe/php-dbg-8.1:8.1.11, profiles: [php-8.1,dbg], <<: [*dev, *parallel] } @@ -150,7 +150,7 @@ services: } }, container_name: php-gcov-8.1, - image: parallelphp/php-gcov-8.1:8.1.11, + image: ghcr.io/krakjoe/php-gcov-8.1:8.1.11, profiles: [php-8.1,gcov], <<: [*dev, *parallel] } @@ -165,7 +165,7 @@ services: } }, container_name: php-asan-8.1, - image: parallelphp/php-asan-8.1:8.1.11, + image: ghcr.io/krakjoe/php-asan-8.1:8.1.11, profiles: [php-8.1,asan], <<: [*dev, *parallel] } @@ -180,7 +180,7 @@ services: } }, container_name: php-release-8.1, - image: parallelphp/php-release-8.1:8.1.11, + image: ghcr.io/krakjoe/php-release-8.1:8.1.11, profiles: [php-8.1,release], <<: [*dev, *parallel] } @@ -196,7 +196,7 @@ services: } }, container_name: parallel-dbg-8.1, - image: parallelphp/parallel-dbg-8.1:latest, + image: ghcr.io/krakjoe/parallel-dbg-8.1:latest, profiles: [parallel-8.1,dbg], <<: [*dev, *parallel] } @@ -212,7 +212,7 @@ services: } }, container_name: parallel-gcov-8.1, - image: parallelphp/parallel-gcov-8.1:latest, + image: ghcr.io/krakjoe/parallel-gcov-8.1:latest, profiles: [parallel-8.1,gcov], <<: [*dev, *parallel] } @@ -227,7 +227,7 @@ services: } }, container_name: parallel-asan-8.1, - image: parallelphp/parallel-asan-8.1:latest, + image: ghcr.io/krakjoe/parallel-asan-8.1:latest, profiles: [parallel-8.1,asan], <<: [*dev, *parallel] } @@ -242,7 +242,7 @@ services: } }, container_name: parallel-release-8.1, - image: parallelphp/parallel-release-8.1:latest, + image: ghcr.io/krakjoe/parallel-release-8.1:latest, profiles: [parallel-8.1,release], <<: [*dev, *parallel] } @@ -256,11 +256,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: php-dbg-8.2, - image: parallelphp/php-dbg-8.2:8.2.0RC5, + image: ghcr.io/krakjoe/php-dbg-8.2:8.2.0, profiles: [php-8.2,dbg], <<: [*dev, *parallel] } @@ -273,11 +272,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: php-gcov-8.2, - image: parallelphp/php-gcov-8.2:8.2.0RC5, + image: ghcr.io/krakjoe/php-gcov-8.2:8.2.0, profiles: [php-8.2,gcov], <<: [*dev, *parallel] } @@ -290,11 +288,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: php-asan-8.2, - image: parallelphp/php-asan-8.2:8.2.0RC5, + image: ghcr.io/krakjoe/php-asan-8.2:8.2.0, profiles: [php-8.2,asan], <<: [*dev, *parallel] } @@ -307,11 +304,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: php-release-8.2, - image: parallelphp/php-release-8.2:8.2.0RC5, + image: ghcr.io/krakjoe/php-release-8.2:8.2.0, profiles: [php-8.2,release], <<: [*dev, *parallel] } @@ -324,11 +320,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: parallel-dbg-8.2, - image: parallelphp/parallel-dbg-8.2:latest, + image: ghcr.io/krakjoe/parallel-dbg-8.2:latest, profiles: [parallel-8.2,dbg], <<: [*dev, *parallel] } @@ -341,11 +336,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: parallel-gcov-8.2, - image: parallelphp/parallel-gcov-8.2:latest, + image: ghcr.io/krakjoe/parallel-gcov-8.2:latest, profiles: [parallel-8.2,gcov], <<: [*dev, *parallel] } @@ -358,11 +352,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: parallel-asan-8.2, - image: parallelphp/parallel-asan-8.2:latest, + image: ghcr.io/krakjoe/parallel-asan-8.2:latest, profiles: [parallel-8.2,asan], <<: [*dev, *parallel] } @@ -375,11 +368,10 @@ services: PHP_VERSION_MAJOR: 8, PHP_VERSION_MINOR: 2, PHP_VERSION_PATCH: 0, - PHP_VERSION_RC: RC5, } }, container_name: parallel-release-8.2, - image: parallelphp/parallel-release-8.2:latest, + image: ghcr.io/krakjoe/parallel-release-8.2:latest, profiles: [parallel-8.2,release], <<: [*dev, *parallel] } diff --git a/docker/parallel.dockerfile b/docker/parallel.dockerfile index 48c8379..18c1549 100644 --- a/docker/parallel.dockerfile +++ b/docker/parallel.dockerfile @@ -4,7 +4,7 @@ ARG PHP_VERSION_MINOR ARG PHP_VERSION_PATCH ARG PHP_VERSION_RC -FROM parallelphp/php-$PHP_SRC_TYPE-$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR:$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR.$PHP_VERSION_PATCH$PHP_VERSION_RC +FROM ghcr.io/krakjoe/php-$PHP_SRC_TYPE-$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR:$PHP_VERSION_MAJOR.$PHP_VERSION_MINOR.$PHP_VERSION_PATCH$PHP_VERSION_RC ARG PHP_SRC_TYPE @@ -38,4 +38,4 @@ RUN echo "extension=parallel.so" > \ RUN php -m -WORKDIR /opt/parallel \ No newline at end of file +WORKDIR /opt/parallel