Skip to content

Commit

Permalink
Merge pull request #60 from wilma-digital/main
Browse files Browse the repository at this point in the history
[BUMP] github actions
  • Loading branch information
mautz-et-tong authored Aug 22, 2024
2 parents 17d387c + 6f86a50 commit 9a78c59
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 41 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/php-7.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [33]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -43,7 +43,7 @@ jobs:
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php-8.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [30]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php-8.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [24,25,26,27,28]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php-8.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [17,18,19,20,21]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php-8.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [5,6,7,8,9]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
container: pipelinecomponents/hadolint:latest
steps:
- uses: actions/checkout@v2
- uses: hadolint/hadolint-action@v1.5.0
- uses: actions/checkout@v4
- uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ./src/${{ matrix.version }}/src/Dockerfile
2 changes: 1 addition & 1 deletion src/7.4/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
2 changes: 1 addition & 1 deletion src/8.0/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
2 changes: 1 addition & 1 deletion src/8.1/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
2 changes: 1 addition & 1 deletion src/8.2/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
2 changes: 1 addition & 1 deletion src/8.3/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down

0 comments on commit 9a78c59

Please sign in to comment.