diff --git a/.github/actions/setup-x64/action.yml b/.github/actions/setup-x64/action.yml index e5856c2fcdbe4..c08ec1696e456 100644 --- a/.github/actions/setup-x64/action.yml +++ b/.github/actions/setup-x64/action.yml @@ -4,9 +4,7 @@ runs: steps: - shell: bash run: | - set -x - - sudo service mysql start + sudo service mysql start || sudo journalctl -xeu mysql.service sudo service slapd start mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" # Ensure local_infile tests can run. diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 63745e628779f..88da8776ac3c1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -104,27 +104,6 @@ jobs: uses: ./.github/actions/setup-mssql - name: Setup Caddy server uses: ./.github/actions/setup-caddy - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - # This duplicates the "job.name" expression above because - # GitHub has no way to query the job name (github.job is the - # job id, not the job name) - key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}-${{hashFiles('main/php_version.h')}}" - append-timestamp: false - save: ${{ github.event_name != 'pull_request' }} - - name: ./configure - uses: ./.github/actions/configure-x64 - with: - configurationParameters: >- - --${{ matrix.debug && 'enable' || 'disable' }}-debug - --${{ matrix.zts && 'enable' || 'disable' }}-zts - ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16' || '' }} - skipSlow: ${{ matrix.asan }} - - name: make - run: make -j$(/usr/bin/nproc) >/dev/null - - name: make install - uses: ./.github/actions/install-linux - name: Setup if: ${{ !matrix.asan }} uses: ./.github/actions/setup-x64 @@ -143,7 +122,7 @@ jobs: if: ${{ !matrix.asan }} uses: ./.github/actions/verify-generated-files LINUX_X32: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: 0 name: LINUX_X32_DEBUG_ZTS runs-on: ubuntu-latest container: @@ -188,7 +167,7 @@ jobs: -d zend_extension=opcache.so -d opcache.enable_cli=1 MACOS_DEBUG_NTS: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: 0 strategy: fail-fast: false matrix: @@ -230,7 +209,7 @@ jobs: - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files WINDOWS: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: 0 name: WINDOWS_X64_ZTS runs-on: windows-2022 env: @@ -257,7 +236,7 @@ jobs: run: .github/scripts/windows/test.bat BENCHMARKING: name: BENCHMARKING - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: 0 runs-on: ubuntu-22.04 steps: - name: git checkout