Merge pull request #223 from OpenHistoricalMap/staging

Update ohm-website - production
OpenHistoricalMap · Aug 17, 2023 · 20a2f68 · 20a2f68
2 parents 25d272c + b11954a
commit 20a2f68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/frontend-overpass.yaml b/.github/workflows/frontend-overpass.yaml
@@ -33,17 +33,18 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenHistoricalMap/overpass-turbo
-          ref: d66745b41cc989187c3df14737f8790fcfb20ca3
+          ref: 43d1d9aa7e8bbb7152c89354900fdd327f9f7ffe
           # token: ${{env.DEV_GITHUB_TOKEN}}
 
-      - name: Use Node.js 10
+      - name: Use Node.js 12
         uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 12
 
       - name: Install modules
         run: |
-          rm -rf node_modules package-lock.json
+          rm -rf node_modules
+          rm package-lock.json
           npm cache clean --force
           npm cache verify
           npm install

diff --git a/images/web/Dockerfile b/images/web/Dockerfile
@@ -48,7 +48,7 @@ RUN npm install -g svgo
 # Install openstreetmap-website
 RUN rm -rf $workdir/html
 
-ENV OPENHISTORICALMAP_WEBSITE_GITSHA=53778a916e51ce8367e8a2345f4a1581b0b3e615
+ENV OPENHISTORICALMAP_WEBSITE_GITSHA=1ec64f07bda4becdaa5254e027594d82e38afc98
 RUN git clone -b staging https://github.com/OpenHistoricalMap/ohm-website.git $workdir
 WORKDIR $workdir
 RUN git checkout $OPENHISTORICALMAP_WEBSITE_GITSHA