Skip to content

Actions: Canonicalize architecture names #10681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Actions: Canonicalize architecture names #10681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .github/actions/apt-x32/action.yml → .github/actions/apt-x86/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/apt-x64/action.yml → .github/actions/apt-x86_64/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/configure-x32/action.yml → ...ub/actions/configure-linux-x86/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/configure-x64/action.yml → ...actions/configure-linux-x86_64/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/configure-macos/action.yml → ...actions/configure-macos-x86_64/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/install-linux-x32/action.yml → .github/actions/install-linux-x86/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/install-linux/action.yml → ...b/actions/install-linux-x86_64/action.yml
View file
Open in desktop
File renamed without changes.
0 .github/actions/setup-x64/action.yml → ...hub/actions/setup-linux-x86_64/action.yml
View file
Open in desktop
File renamed without changes.
58 changes: 29 additions & 29 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Generate Matrix
id: set-matrix
run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}"
LINUX_X64:
LINUX_X86_64:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
Expand All @@ -44,7 +44,7 @@ jobs:
test_function_jit: [true]
zts: [true, false]
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
name: "${{ matrix.branch.name }}_LINUX_X86_64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: ubuntu-20.04
steps:
- name: git checkout
Expand All @@ -56,9 +56,9 @@ jobs:
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: ./configure
uses: ./.github/actions/configure-x64
uses: ./.github/actions/configure-linux-x86_64
with:
configurationParameters: >-
${{ matrix.configuration_parameters }}
Expand All @@ -67,9 +67,9 @@ jobs:
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux
uses: ./.github/actions/install-linux-x86_64
- name: Setup
uses: ./.github/actions/setup-x64
uses: ./.github/actions/setup-linux-x86_64
- name: Test
uses: ./.github/actions/test-linux
with:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
-d opcache.jit=1205
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
LINUX_X32:
LINUX_X86:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
Expand All @@ -113,7 +113,7 @@ jobs:
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
debug: [true, false]
zts: [true, false]
name: "${{ matrix.branch.name }}_LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
name: "${{ matrix.branch.name }}_LINUX_X86_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: ubuntu-latest
container:
image: ubuntu:20.04
Expand All @@ -135,17 +135,17 @@ jobs:
with:
ref: ${{ matrix.branch.ref }}
- name: apt
uses: ./.github/actions/apt-x32
uses: ./.github/actions/apt-x86
- name: ./configure
uses: ./.github/actions/configure-x32
uses: ./.github/actions/configure-linux-x86
with:
configurationParameters: >-
--${{ matrix.debug && 'enable' || 'disable' }}-debug
--${{ matrix.zts && 'enable' || 'disable' }}-zts
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux-x32
uses: ./.github/actions/install-linux-x86
- name: Test
uses: ./.github/actions/test-linux
with:
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
-d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
-d opcache.jit=1205
MACOS:
MACOS_X86_64:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
Expand All @@ -194,7 +194,7 @@ jobs:
- name: brew
uses: ./.github/actions/brew
- name: ./configure
uses: ./.github/actions/configure-macos
uses: ./.github/actions/configure-macos-x86_64
with:
configurationParameters: >-
--${{ matrix.debug && 'enable' || 'disable' }}-debug
Expand Down Expand Up @@ -244,19 +244,19 @@ jobs:
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: Install gcovr
run: sudo -H pip install gcovr
- name: ./configure
uses: ./.github/actions/configure-x64
uses: ./.github/actions/configure-linux-x86_64
with:
configurationParameters: --enable-debug --disable-zts --enable-gcov
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux
uses: ./.github/actions/install-linux-x86_64
- name: Setup
uses: ./.github/actions/setup-x64
uses: ./.github/actions/setup-linux-x86_64
# We only test with OpCache, the difference in coverage is negligible
- name: Test OpCache
uses: ./.github/actions/test-linux
Expand All @@ -267,7 +267,7 @@ jobs:
- name: Upload Test Coverage to Codecov.io
if: always()
run: bash <(curl -s https://codecov.io/bash)
COMMUNITY:
COMMUNITY_X86_64:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
Expand All @@ -286,9 +286,9 @@ jobs:
with:
ref: ${{ matrix.branch.ref }}
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: ./configure
uses: ./.github/actions/configure-x64
uses: ./.github/actions/configure-linux-x86_64
with:
configurationParameters: >-
--enable-debug
Expand All @@ -298,7 +298,7 @@ jobs:
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux
uses: ./.github/actions/install-linux-x86_64
- name: Setup
run: |
sudo service mysql start
Expand Down Expand Up @@ -382,7 +382,7 @@ jobs:
if [ $EXIT_CODE -gt 128 ]; then
exit 1
fi
OPCACHE_VARIATION:
OPCACHE_VARIATION_X86_64:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
Expand All @@ -401,18 +401,18 @@ jobs:
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: ./configure
uses: ./.github/actions/configure-x64
uses: ./.github/actions/configure-linux-x86_64
with:
configurationParameters: >-
--enable-debug --disable-zts
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux
uses: ./.github/actions/install-linux-x86_64
- name: Setup
uses: ./.github/actions/setup-x64
uses: ./.github/actions/setup-linux-x86_64
- name: Test File Cache (prime shm)
uses: ./.github/actions/test-linux
with:
Expand Down Expand Up @@ -453,22 +453,22 @@ jobs:
-d opcache.file_cache_only=1
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
MSAN:
LINUX_MSAN_X86_64:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
strategy:
fail-fast: false
matrix:
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
name: "${{ matrix.branch.name }}_MSAN"
name: "${{ matrix.branch.name }}_LINUX_MSAN_X86_64"
runs-on: ubuntu-22.04
steps:
- name: git checkout
uses: actions/checkout@v3
with:
ref: ${{ matrix.branch.ref }}
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: ./configure
run: |
export CC=clang
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
branches:
- '**'
jobs:
LINUX_X64:
LINUX_X86_64:
strategy:
fail-fast: false
matrix:
Expand All @@ -27,7 +27,7 @@ jobs:
zts: false
- debug: false
zts: true
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
name: "LINUX_X86_64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: ubuntu-20.04
steps:
- name: git checkout
Expand All @@ -37,19 +37,19 @@ jobs:
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
uses: ./.github/actions/apt-x86_64
- name: ./configure
uses: ./.github/actions/configure-x64
uses: ./.github/actions/configure-linux-x86_64
with:
configurationParameters: >-
--${{ matrix.debug && 'enable' || 'disable' }}-debug
--${{ matrix.zts && 'enable' || 'disable' }}-zts
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux
uses: ./.github/actions/install-linux-x86_64
- name: Setup
uses: ./.github/actions/setup-x64
uses: ./.github/actions/setup-linux-x86_64
- name: Test
uses: ./.github/actions/test-linux
- name: Test Tracing JIT
Expand All @@ -61,8 +61,8 @@ jobs:
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
LINUX_X32:
name: LINUX_X32_DEBUG_ZTS
LINUX_X86:
name: LINUX_X86_DEBUG_ZTS
runs-on: ubuntu-latest
container:
image: ubuntu:20.04
Expand All @@ -82,17 +82,17 @@ jobs:
- name: git checkout
uses: actions/checkout@v3
- name: apt
uses: ./.github/actions/apt-x32
uses: ./.github/actions/apt-x86
- name: ./configure
uses: ./.github/actions/configure-x32
uses: ./.github/actions/configure-linux-x86
with:
configurationParameters: >-
--enable-debug
--enable-zts
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
uses: ./.github/actions/install-linux-x32
uses: ./.github/actions/install-linux-x86
- name: Test
uses: ./.github/actions/test-linux
- name: Test Tracing JIT
Expand All @@ -102,15 +102,15 @@ jobs:
-d zend_extension=opcache.so
-d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
MACOS_DEBUG_NTS:
MACOS_X86_64_DEBUG_NTS:
runs-on: macos-11
steps:
- name: git checkout
uses: actions/checkout@v3
- name: brew
uses: ./.github/actions/brew
- name: ./configure
uses: ./.github/actions/configure-macos
uses: ./.github/actions/configure-macos-x86_64
with:
configurationParameters: --enable-debug --disable-zts
- name: make
Expand Down