Skip to content

Commit

Permalink
Merge pull request #16457 from phalcon/5.0.x
Browse files Browse the repository at this point in the history
5.4.0 Release
  • Loading branch information
niden authored Oct 25, 2023
2 parents 485ad1a + 2194aa0 commit 37f5eb8
Show file tree
Hide file tree
Showing 345 changed files with 161,475 additions and 164,145 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build-phalcon-mac/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ runs:
steps:
- name: Configure macOS Environment
shell: bash
# Xcode paths: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md#xcode
# Xcode paths: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode
run: |
sudo xcode-select -s /Applications/Xcode_13.0.app
sudo xcode-select -s /Applications/Xcode_14.2.app
xcodebuild -version
- name: 'Build Phalcon for macOS'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-phalcon-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
using: 'composite'
steps:
- name: Setup Downloads Cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIR }}
key: ${{ runner.os }}-downloads-${{ hashFiles('**/.github/actions/build-phalcon-win/action.yml') }}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

env:
# All versions should be declared here
PHALCON_VERSION: 5.3.1
PHALCON_VERSION: 5.4.0
ZEPHIR_PARSER_VERSION: 1.5.3
ZEPHIR_VERSION: 0.17.0

Expand Down Expand Up @@ -50,6 +50,8 @@ jobs:
name: Setup Zephir Extensions
run: |
echo "::set-output name=extensions::zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}"
# echo "extensions=zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}" >> "$GITHUB_ENV" # Need to change the templates to use this


# PHP CodeSniffer inspection
phpcs:
Expand Down Expand Up @@ -100,7 +102,7 @@ jobs:
# Linux
- { name: ubuntu-gcc, os: ubuntu-20.04, compiler: gcc }
# macOS
- { name: macos-clang, os: macos-11, compiler: clang }
- { name: macos-clang, os: macos-12, compiler: clang }
# Windows
- { php: '7.4', ts: 'ts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
- { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
Expand Down Expand Up @@ -137,7 +139,7 @@ jobs:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download Phalcon Pecl Package
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: phalcon-pecl
path: ./phalcon-pecl
Expand Down Expand Up @@ -180,6 +182,7 @@ jobs:
$PhalconExtPath = "$(php-config --extension-dir)/phalcon.so"
}
echo "::set-output name=extension-path::$PhalconExtPath"
# echo "extension-path=$PhalconExtPath" >> "$GITHUB_ENV" # This needs to be checked, used below somehow

- name: Creates build artifact with Phalcon extension
uses: ./.github/actions/pack-phalcon-ext
Expand Down Expand Up @@ -388,6 +391,7 @@ jobs:
id: get-version
run: |
echo ::set-output name=version::${GITHUB_REF#refs/tags/}
# echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV" # This needs to be checked

- name: Download Phalcon build artifacts
id: download
Expand Down
Loading

0 comments on commit 37f5eb8

Please sign in to comment.