Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeckerson committed Jun 3, 2024
2 parents dbb52fe + 1164c6f commit 11e4afe
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 137 deletions.
111 changes: 0 additions & 111 deletions .ci/install-re2c.sh

This file was deleted.

11 changes: 7 additions & 4 deletions .github/actions/build-mac/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ runs:
steps:
- name: Install RE2C Lexer Generator
shell: bash
run: |
brew install re2c lcov
run: brew install re2c lcov
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
HOMEBREW_NO_INSTALL_CLEANUP: "1"

- name: Build Zephir Parser for macOS
shell: bash
Expand Down Expand Up @@ -39,4 +38,8 @@ runs:
shell: bash
run: |
cp ./modules/zephir_parser.so "$(php -r 'echo ini_get("extension_dir");')/zephir_parser.so"
echo "extension=zephir_parser.so" > /usr/local/etc/php/${{ matrix.php }}/conf.d/ext-zephir_parser.ini
if [ "${{ matrix.ts }}" = "ts" ]; then
echo "extension=zephir_parser.so" > /usr/local/etc/php/${{ matrix.php }}-zts/conf.d/ext-zephir_parser.ini
else
echo "extension=zephir_parser.so" > /usr/local/etc/php/${{ matrix.php }}/conf.d/ext-zephir_parser.ini
fi
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# Linux
- { name: ubuntu-gcc, os: ubuntu-latest, compiler: gcc, ccov: 'ON' }
# macOS
- { name: macos-clang, os: macos-12, compiler: clang, ccov: 'ON' }
- { name: macos-clang, os: macos-12, compiler: clang, ccov: 'OFF' }
# Windows
- { php: '7.0', ts: 'nts', arch: 'x64', name: 'windows2019-vc14', os: 'windows-2019', compiler: 'vc14', ccov: 'OFF' }
- { php: '7.0', ts: 'ts', arch: 'x64', name: 'windows2019-vc14', os: 'windows-2019', compiler: 'vc14', ccov: 'OFF' }
Expand All @@ -60,11 +60,11 @@ jobs:
- { php: '8.1', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
- { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
- { php: '8.2', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
#- { php: '8.3', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
#- { php: '8.3', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
- { php: '8.3', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }
- { php: '8.3', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16', ccov: 'OFF' }

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
# zephir_parser-php-7.3-nts-ubuntu-gcc-x64.zip
# zephir_parser-php-7.3-nts-windows2019-vc15-x64.zip
- name: Upload Zephir Parser
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zephir_parser-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.arch }}.zip
path: |
Expand All @@ -165,15 +165,15 @@ jobs:

- name: Upload Code Coverage Report
if: matrix.ccov == 'ON'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./lcov.info
flags: unittests,${{ runner.os }}

- name: Upload Info for Debug on Fail
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 2
name: debug-zephir_parser-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.arch }}
Expand All @@ -188,12 +188,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
tools: pecl

- name: Install System Dependencies
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
pecl info zephir_parser-pecl.tgz
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: 'zephir_parser-pecl'
path: zephir_parser-pecl.tgz
Expand All @@ -258,7 +258,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -269,7 +269,7 @@ jobs:
- name: Download Zephir Parser build artifacts
id: download
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: ./build-artifacts

Expand Down
18 changes: 8 additions & 10 deletions ide/zephir_parser.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?php

/*
+--------------------------------------------------------------------------+
| Zephir Parser |
| Copyright (c) 2013-present Zephir Team (https://zephir-lang.com/) |
| |
| This source file is subject the MIT license, that is bundled with this |
| package in the file LICENSE, and is available through the world-wide-web |
| at the following url: http://zephir-lang.com/license.html |
+--------------------------------------------------------------------------+
*/
/**
* This file is part of the Zephir.
*
* (c) Phalcon Team <[email protected]>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

/**
* Parses a file and returning an intermediate representation.
Expand Down

0 comments on commit 11e4afe

Please sign in to comment.