Bumps & unify versions across workflows

.github/workflows/pr-cleanup.yml

@@ -26,7 +26,7 @@ jobs:
       has_label: ${{ steps.label.outputs.has_label }}
 
   undeploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [check]
     if: "needs.check.status_code != '404' && (github.event.action == 'closed' || !needs.check.has_label)"
     steps:

.github/workflows/pr.yml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Debug
         uses: hmarr/[email protected]
@@ -48,7 +48,7 @@ jobs:
   build:
     if: contains(github.event.pull_request.labels.*.name, 'deploy-preview')
     needs: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -75,7 +75,7 @@ jobs:
             BUILD_MODE=staging
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: contains(github.event.pull_request.labels.*.name, 'deploy-preview')
     needs: build
     steps:

.github/workflows/prod.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Debug
         uses: hmarr/[email protected]
@@ -32,7 +32,7 @@ jobs:
       # - run: yarn test-fsharp
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: test
     steps:
       - name: Checkout repo
@@ -60,7 +60,7 @@ jobs:
             BUILD_MODE=production
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build
     steps:
       - name: Checkout repo

.github/workflows/stage.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Debug
         uses: hmarr/[email protected]
@@ -45,7 +45,7 @@ jobs:
       # - run: yarn test-fsharp
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: test
     if: "!contains(github.event.head_commit.message, 'NOBUILD')"
     steps:
@@ -74,7 +74,7 @@ jobs:
             BUILD_MODE=staging
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build
     if: "!contains(github.event.head_commit.message, 'NODEPLOY')"
     steps:

Dockerfile

@@ -1,10 +1,20 @@
 ########################################
 # Intermediate builder image (used only for build, discarded in final stage)
 ########################################
-FROM ghcr.io/sledilnik/website-base AS builder
+FROM bitnami/dotnet-sdk:8-debian-11 as builder
+ARG NODE_MAJOR=18
+
+WORKDIR /app
 
 ARG BUILD_MODE=production
 
+RUN apt-get update && apt-get install -y ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg;
+
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list;
+
+RUN apt-get update && apt-get install nodejs -y && npm install --global yarn
+
 ADD . /app
 RUN yarn
 RUN CADDY_BUILD=1 yarn build --mode ${BUILD_MODE}

Owid.Analyzer/Owid.Analyzer.fsproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

src/visualizations/App.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="Components/Slider.fs" />

tests/Visualizations.Tests/Visualizations.Tests.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
         <GenerateProgramFile>false</GenerateProgramFile>

yarn.lock

@@ -3479,9 +3479,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001359:
-  version "1.0.30001473"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz"
-  integrity sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==
+  version "1.0.30001655"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz"
+  integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -12216,10 +12216,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^4.0.0:
-  version "4.46.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
-  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+"webpack@>=4.47.0 <5":
+  version "4.47.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.47.0.tgz#8b8a02152d7076aeb03b61b47dad2eeed9810ebc"
+  integrity sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -12245,7 +12245,7 @@ webpack@^4.0.0:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-webpack@^5.54.0:
+webpack@^5.61.0:
   version "5.73.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
   integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==