Skip to content

Commit

Permalink
Merge acd62a5 into 60a925e
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelmeister committed Apr 28, 2024
2 parents 60a925e + acd62a5 commit f496c65
Show file tree
Hide file tree
Showing 147 changed files with 4,339 additions and 3,293 deletions.
4 changes: 2 additions & 2 deletions .docker-hub/print/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM node:20.12.1 AS build-stage
FROM node:20.12.2 AS build-stage
ARG SENTRY_AUTH_TOKEN
ARG SENTRY_ORG
ARG SENTRY_PRINT_PROJECT
Expand All @@ -22,7 +22,7 @@ COPY print .
RUN npm run build

# production stage
FROM node:20.12.1 AS production-stage
FROM node:20.12.2 AS production-stage
WORKDIR /app

COPY --from=build-stage /app/.output ./.output
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: 'Api Platform check dependencies'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration-optional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: 'Validate Api Platform composer.lock'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand All @@ -32,7 +32,7 @@ jobs:
name: 'Lint: API (psalm)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
name: 'Lint: API (phpstan)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: 'Lint: API (php-cs-fixer)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
name: 'Lint: Frontend (ESLint)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
name: 'Lint: ClientPrint (ESLint)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
name: 'Lint: Print (ESLint)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
name: 'Lint: e2e (ESLint)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
name: 'Tests: Frontend'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
name: 'Tests: Print'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
name: 'Tests: PDF'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment-pr-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
to-uninstall: ${{ steps.to-uninstall.outputs.list }}
never-uninstall: ${{ steps.to-uninstall.outputs.never_uninstall }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Find all open PRs that have a "deploy!" label
id: deployment-candidates
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: No "Meeting Discuss" label
runs-on: ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@132879b972cb7f2ac593006455875098e73cc7f2 # v5
- uses: mheap/github-action-required-labels@5847eef68201219cf0a4643ea7be61e77837bbce # v5
if: github.event_name == 'pull_request'
with:
mode: exactly
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/reusable-api-performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5
--cpus 1
--memory 1G
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Build images and push
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
ref: ${{ inputs.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-dev-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
|<span aria-hidden="true">🔍</span> Latest deploy log | [${{ steps.job-url.outputs.html_url }}](${{ steps.job-url.outputs.html_url }}) |
comment_tag: feature-branch-deployment-status

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
ref: ${{ inputs.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-e2e-tests-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Set up Docker Buildx
id: buildx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-e2e-tests-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- firefox
- edge
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- run: cp .env.ci .env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-stage-prod-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
environment: ${{ github.ref_name }}
domain: ${{ vars.SUBDOMAIN }}.${{ vars.DOMAIN }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Create a pending GitHub deployment
uses: bobheadxi/deployments@v1.5.0
Expand Down
1 change: 1 addition & 0 deletions .helm/ecamp3/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ php:
appSecret: ""
corsAllowOrigin: "^https://.*?\\.chart-example\\.local$"
trustedProxies:
- "::1"
- "127.0.0.1"
- "10.0.0.0/8"
- "172.16.0.0/12"
Expand Down
4 changes: 2 additions & 2 deletions .ops/aws-setup/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
aws-setup:
image: pulumi/pulumi-nodejs:3.112.0
image: pulumi/pulumi-nodejs:3.114.0
container_name: 'ecamp3-aws-setup'
volumes:
- ../../.prettierrc:/.prettierrc:delegated
Expand All @@ -15,7 +15,7 @@ services:
- AWS_DEFAULT_REGION=eu-west-3

aws-cli:
image: amazon/aws-cli:2.15.35
image: amazon/aws-cli:2.15.42
container_name: 'ecamp3-aws-cli'
volumes:
- ./.aws:/root/.aws:delegated
Expand Down
Loading

0 comments on commit f496c65

Please sign in to comment.