Merge branch 'main' of https://github.com/blumilksoftware/interns2024b …

…into 19-tests-should-be-scheduled
blumilksoftware · Aug 19, 2024 · 6ea7c71 · 6ea7c71
2 parents 79db92b + 521c5b9
commit 6ea7c71
Show file tree

Hide file tree

Showing 6 changed files with 779 additions and 332 deletions.
diff --git a/.github/workflows/test-and-lint-js.yml b/.github/workflows/test-and-lint-js.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].4 # https://github.com/actions/checkout
+      - uses: actions/[email protected].7 # https://github.com/actions/checkout
 
       - name: Cache dependencies
         uses: actions/[email protected] # https://github.com/actions/cache
@@ -29,7 +29,7 @@ jobs:
           restore-keys: ${{ runner.os }}-npm-dependencies
 
       - name: Set up node
-        uses: actions/[email protected].2 # https://github.com/actions/setup-node
+        uses: actions/[email protected].3 # https://github.com/actions/setup-node
         with:
           node-version: 21
 

diff --git a/.github/workflows/test-and-lint-php.yml b/.github/workflows/test-and-lint-php.yml
@@ -34,7 +34,7 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/[email protected].4 # https://github.com/actions/checkout
+      - uses: actions/[email protected].7 # https://github.com/actions/checkout
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -47,7 +47,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-dependencies
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.4 # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@2.31.1 # https://github.com/shivammathur/setup-php
         with:
           php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl

diff --git a/composer.lock b/composer.lock
diff --git a/environment/dev/app/Dockerfile b/environment/dev/app/Dockerfile
@@ -1,8 +1,8 @@
 # For other versions check: https://hub.docker.com/_/composer/tags
-FROM composer/composer:2.7.6-bin as composer-bin
+FROM composer/composer:2.7.6-bin AS composer-bin
 
 # For other versions check: https://hub.docker.com/_/node/tags?page=1&name=bullseye-slim
-FROM node:22.1-bullseye-slim as node
+FROM node:22.6-bullseye-slim AS node
 
 # For other versions check: https://hub.docker.com/_/php/tags?page=1&name=fpm-bullseye
 FROM php:8.3.7-fpm-bullseye