Skip to content

Merge release 1.36.0 into 2.0.x #194

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.

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

Merged
merged 21 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a5f87d7
Lock file maintenance
renovate[bot] Sep 4, 2023
a0336b1
Update actions/checkout action to v4
renovate[bot] Sep 5, 2023
ac44b99
Merge pull request #180 from laminas/renovate/actions-checkout-4.x
boesing Sep 5, 2023
2603351
Lock file maintenance
renovate[bot] Sep 10, 2023
84f6fa5
Lock file maintenance
renovate[bot] Sep 18, 2023
0ccb38f
bugfix: temporarily copy some files required by `phpize` during conta…
boesing Oct 1, 2023
907ce3c
qa: re-order composer installation and default PHP version handling
boesing Oct 1, 2023
7a5bb2a
bugfix: remove trailing backslash to avoid appending the upcoming `RU…
boesing Oct 1, 2023
71bf983
Merge pull request #189 from boesing/bugfix/phpize-8.3-missing-tools
boesing Oct 1, 2023
59bb18e
Merge pull request #190 from laminas/1.35.x-merge-up-into-1.36.x_P9mR…
boesing Oct 1, 2023
aea6b5e
Lock file maintenance
renovate[bot] Oct 2, 2023
5c4f61f
Update docker/metadata-action action to v5
renovate[bot] Oct 3, 2023
bef65ca
Update docker/setup-buildx-action action to v3
renovate[bot] Oct 3, 2023
e2d2748
qa: remove temporary fix for pre PHP 8.3 RC3
boesing Oct 8, 2023
440cf10
Merge pull request #186 from laminas/renovate/docker-setup-buildx-act…
boesing Oct 8, 2023
aa67e35
Merge pull request #185 from laminas/renovate/docker-metadata-action-5.x
boesing Oct 8, 2023
2b82153
Update docker/login-action action to v3
renovate[bot] Oct 8, 2023
f258ad8
Merge pull request #184 from laminas/renovate/docker-login-action-3.x
boesing Oct 8, 2023
152859e
Update docker/build-push-action action to v5
renovate[bot] Oct 8, 2023
a5a5a51
Merge pull request #183 from laminas/renovate/docker-build-push-actio…
boesing Oct 8, 2023
a5bdf41
Merge pull request #193 from laminas/qa/update-php-8.3-rc3
boesing Oct 8, 2023
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
10 changes: 5 additions & 5 deletions .github/workflows/build-and-push-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ jobs:
DOCKER_USER: ${{ secrets.CONTAINER_USERNAME }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
install: true

- name: Login to GitHub Container Registry
if: ${{ github.event_name == 'release' }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/laminas/laminas-continuous-integration
tags: |
Expand All @@ -42,7 +42,7 @@ jobs:
latest=false

- name: Build image. Push for release
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-additional-action-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
needs: [tags]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Update tags
env:
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

- name: "Release"
uses: "laminas/automatic-releases@v1"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

- name: "Run ShellCheck"
uses: "reviewdog/action-shellcheck@v1"
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -263,22 +263,22 @@ COPY composer.json \
composer.lock \
/tools/

RUN cd /tools \
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
&& apt install -y php-bcmath php8.3-bcmath \
&& composer install \
--classmap-authoritative

# Set default PHP version based on the `composer.json` `config.platform.php` setting
RUN export DEFAULT_PHP_VERSION=$(jq -r '.config.platform.php | sub("(?<minor>[0-9.]).99$"; "\(.minor)")' /tools/composer.json) \
# Cleanup composer files from external tools folder
&& rm /tools/composer.* \
&& update-alternatives --set php /usr/bin/php$DEFAULT_PHP_VERSION \
&& update-alternatives --set phpize /usr/bin/phpize$DEFAULT_PHP_VERSION \
&& update-alternatives --set php-config /usr/bin/php-config$DEFAULT_PHP_VERSION \
&& update-alternatives --set phpdbg /usr/bin/phpdbg$DEFAULT_PHP_VERSION \
&& echo "DEFAULT_PHP_VERSION=${DEFAULT_PHP_VERSION}" >> /etc/environment

RUN cd /tools \
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
&& apt install -y php-bcmath \
&& composer install \
--classmap-authoritative \
# Cleanup composer files from external tools folder
&& rm /tools/composer.*

# Copy staabm/annotate-pull-request-from-checkstyle to external-tools stage
RUN ln -s /tools/vendor/bin/cs2pr /usr/local/bin/cs2pr

Expand Down
100 changes: 50 additions & 50 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.