upgrade alpine to 3.18

Force intl v73.1 on CI that we use the same version. There is a breaking change between the default intl (icu) version on the CI and the alpine image used. Don't update the intl package automatically because this could not be achieved by @BacLuc until now. Issue: #3246
ecamp · May 18, 2023 · fdeeb7c · fdeeb7c
1 parent 78e17eb
commit fdeeb7c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -135,6 +135,7 @@ jobs:
       - uses: shivammathur/setup-php@v2
         with:
           php-version: '8.2.6'
+          extensions: intl-73.1
           tools: composer:2.5.0
           coverage: xdebug
 

diff --git a/api/Dockerfile b/api/Dockerfile
@@ -11,7 +11,7 @@
 ARG PHP_VERSION=8.2.6
 
 # renovate: datasource=docker depName=alpine
-ARG ALPINE_VERSION=3.16
+ARG ALPINE_VERSION=3.18
 
 # renovate: datasource=docker depName=caddy
 ARG CADDY_VERSION=2.6.4

diff --git a/api/tests/Api/Camps/CreateCampTest.php b/api/tests/Api/Camps/CreateCampTest.php
@@ -126,7 +126,7 @@ public function testCreateCampValidatesInvalidPeriods() {
             'violations' => [
                 [
                     'propertyPath' => 'periods[0].start',
-                    'message' => 'This value should be less than or equal to Jan 8, 2022, 12:00 AM.',
+                    'message' => 'This value should be less than or equal to Jan 8, 2022, 12:00 AM.',
                 ],
             ],
         ]);

diff --git a/api/tests/Api/Periods/CreatePeriodTest.php b/api/tests/Api/Periods/CreatePeriodTest.php
@@ -265,11 +265,11 @@ public function testCreatePeriodValidatesStartAfterEnd() {
             'violations' => [
                 [
                     'propertyPath' => 'start',
-                    'message' => 'This value should be less than or equal to Jan 9, 2021, 12:00 AM.',
+                    'message' => 'This value should be less than or equal to Jan 9, 2021, 12:00 AM.',
                 ],
                 [
                     'propertyPath' => 'end',
-                    'message' => 'This value should be greater than or equal to Jan 10, 2021, 12:00 AM.',
+                    'message' => 'This value should be greater than or equal to Jan 10, 2021, 12:00 AM.',
                 ],
             ],
         ]);

diff --git a/api/tests/Api/Periods/UpdatePeriodTest.php b/api/tests/Api/Periods/UpdatePeriodTest.php
@@ -274,11 +274,11 @@ public function testPatchPeriodValidatesStartAfterEnd() {
             'violations' => [
                 [
                     'propertyPath' => 'start',
-                    'message' => 'This value should be less than or equal to Jan 9, 2021, 12:00 AM.',
+                    'message' => 'This value should be less than or equal to Jan 9, 2021, 12:00 AM.',
                 ],
                 [
                     'propertyPath' => 'end',
-                    'message' => 'This value should be greater than or equal to Jan 10, 2021, 12:00 AM.',
+                    'message' => 'This value should be greater than or equal to Jan 10, 2021, 12:00 AM.',
                 ],
             ],
         ]);

diff --git a/api/tests/Api/ScheduleEntries/CreateScheduleEntryTest.php b/api/tests/Api/ScheduleEntries/CreateScheduleEntryTest.php
@@ -151,7 +151,7 @@ public function testCreateScheduleEntryValidatesStartBeforePeriodStart() {
             'violations' => [
                 [
                     'propertyPath' => 'start',
-                    'message' => 'This value should be greater than or equal to May 1, 2023, 12:00 AM.',
+                    'message' => 'This value should be greater than or equal to May 1, 2023, 12:00 AM.',
                 ],
             ],
         ]);
@@ -177,7 +177,7 @@ public function testCreateScheduleEntryValidatesNegativeLength() {
             'violations' => [
                 [
                     'propertyPath' => 'end',
-                    'message' => 'This value should be greater than May 1, 2023, 1:30 AM.',
+                    'message' => 'This value should be greater than May 1, 2023, 1:30 AM.',
                 ],
             ],
         ]);

diff --git a/api/tests/Api/ScheduleEntries/UpdateScheduleEntryTest.php b/api/tests/Api/ScheduleEntries/UpdateScheduleEntryTest.php
@@ -194,7 +194,7 @@ public function testPatchScheduleEntryValidatesStartBeforePeriodStart() {
             'violations' => [
                 [
                     'propertyPath' => 'start',
-                    'message' => 'This value should be greater than or equal to May 1, 2023, 12:00 AM.',
+                    'message' => 'This value should be greater than or equal to May 1, 2023, 12:00 AM.',
                 ],
             ],
         ]);
@@ -224,7 +224,7 @@ public function testPatchScheduleEntryValidatesNegativeLength() {
             'violations' => [
                 [
                     'propertyPath' => 'end',
-                    'message' => 'This value should be greater than May 1, 2023, 12:40 AM.',
+                    'message' => 'This value should be greater than May 1, 2023, 12:40 AM.',
                 ],
             ],
         ]);
@@ -264,7 +264,7 @@ public function testPatchScheduleEntryValidatesEndAfterPeriodEnd() {
             'violations' => [
                 [
                     'propertyPath' => 'end',
-                    'message' => 'This value should be less than or equal to May 4, 2023, 12:00 AM.',
+                    'message' => 'This value should be less than or equal to May 4, 2023, 12:00 AM.',
                 ],
             ],
         ]);

diff --git a/renovate.json b/renovate.json
@@ -102,12 +102,6 @@
       ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<compatibility>\\w+)-(?<build>\\d+)\\.(\\d+)\\.(\\d+)?$"
     },
-    {
-      "matchPackageNames": [
-        "alpine"
-      ],
-      "allowedVersions": "3.16"
-    },
     {
       "matchPackageNames": [
         "postgres"