Skip to content

Commit edb862c

Browse files
johncarmack1984systemed
authored andcommitted
Update CI workflow and fix infrastructure issues
- Update actions/checkout from v2 to v4 - Update actions/cache from v2 to v4 - Update docker/login-action to v3 - Update docker/metadata-action to v5 - Update docker/build-push-action to v6 - Add -L flag to curl commands to follow redirects - Use HTTPS for Geofabrik downloads - Fix Docker CMake boost_system variant issue with -DBoost_USE_DEBUG_RUNTIME=OFF
1 parent d19d080 commit edb862c

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
runs-on: windows-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919

2020
- name: Enable vcpkg cache
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
with:
2323
path: c:\vcpkg\installed
2424
key: windows-vcpkg-x64-0 # Increase the number whenever dependencies are modified
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: Build openmaptiles-compatible mbtiles files of Liechtenstein
3838
run: |
39-
Invoke-WebRequest -Uri http://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -OutFile ${{ env.AREA }}.osm.pbf
39+
Invoke-WebRequest -Uri https://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -OutFile ${{ env.AREA }}.osm.pbf -MaximumRedirection 5
4040
${{ github.workspace }}\build\RelWithDebInfo\tilemaker.exe ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.pmtiles --verbose
4141
${{ github.workspace }}\build\RelWithDebInfo\tilemaker.exe ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.mbtiles --store osm_store --verbose
4242
@@ -62,10 +62,10 @@ jobs:
6262
runs-on: ${{ matrix.os }}
6363

6464
steps:
65-
- uses: actions/checkout@v2
65+
- uses: actions/checkout@v4
6666

6767
- name: Enable vcpkg cache
68-
uses: actions/cache@v2
68+
uses: actions/cache@v4
6969
with:
7070
path: ${{ matrix.path }}
7171
key: vcpkg-${{ matrix.triplet }}-0 # Increase the number whenever dependencies are modified
@@ -85,7 +85,7 @@ jobs:
8585
8686
- name: Build openmaptiles-compatible mbtiles files of Liechtenstein
8787
run: |
88-
curl http://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -o ${{ env.AREA }}.osm.pbf
88+
curl -L https://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -o ${{ env.AREA }}.osm.pbf
8989
${{ github.workspace }}/build/${{ matrix.executable }} ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.pmtiles --verbose
9090
${{ github.workspace }}/build/${{ matrix.executable }} ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.mbtiles --verbose --store /tmp/store
9191
@@ -109,7 +109,7 @@ jobs:
109109
runs-on: ${{ matrix.os }}
110110

111111
steps:
112-
- uses: actions/checkout@v2
112+
- uses: actions/checkout@v4
113113

114114
- name: Install Linux dependencies
115115
if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -129,7 +129,7 @@ jobs:
129129
130130
- name: Build openmaptiles-compatible mbtiles files of Liechtenstein
131131
run: |
132-
curl http://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -o ${{ env.AREA }}.osm.pbf
132+
curl -L https://download.geofabrik.de/europe/${{ env.AREA }}-latest.osm.pbf -o ${{ env.AREA }}.osm.pbf
133133
./tilemaker ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.pmtiles --verbose
134134
./tilemaker ${{ env.AREA }}.osm.pbf --config=resources/config-openmaptiles.json --process=resources/process-openmaptiles.lua --output=${{ env.AREA }}.mbtiles --verbose --store /tmp/store
135135
@@ -140,10 +140,10 @@ jobs:
140140

141141
steps:
142142
- name: Check out repository
143-
uses: actions/checkout@v2
143+
uses: actions/checkout@v4
144144

145145
- name: Download PBF file
146-
run: curl http://download.geofabrik.de/europe/${AREA}-latest.osm.pbf -o ${AREA}.osm.pbf
146+
run: curl -L https://download.geofabrik.de/europe/${AREA}-latest.osm.pbf -o ${AREA}.osm.pbf
147147

148148
- name: Build openmaptiles-compatible mbtiles files of given area
149149
uses: ./
@@ -163,31 +163,31 @@ jobs:
163163

164164
steps:
165165
- name: Checkout repository
166-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
167167

168168
- name: Log in to the Container registry
169-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
169+
uses: docker/login-action@v3
170170
with:
171171
registry: ${{ env.REGISTRY }}
172172
username: ${{ github.actor }}
173173
password: ${{ secrets.GITHUB_TOKEN }}
174174

175175
- name: Extract metadata (tags, labels) for Docker
176176
id: meta
177-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
177+
uses: docker/metadata-action@v5
178178
with:
179179
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
180180

181181
- name: Build Docker image
182-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
182+
uses: docker/build-push-action@v6
183183
if: ${{ github.ref != 'refs/heads/master'}}
184184
with:
185185
context: .
186186
push: false
187187
tags: ${{ steps.meta.outputs.tags }}
188188
labels: ${{ steps.meta.outputs.labels }}
189189
- name: Build and push Docker image
190-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
190+
uses: docker/build-push-action@v6
191191
if: ${{ github.ref == 'refs/heads/master'}}
192192
with:
193193
context: .

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ COPY server ./server
2828
RUN mkdir build && \
2929
cd build && \
3030
if [ -z "$BUILD_DEBUG" ]; then \
31-
cmake -DCMAKE_BUILD_TYPE=Release ..; \
31+
cmake -DCMAKE_BUILD_TYPE=Release -DBoost_USE_DEBUG_RUNTIME=OFF ..; \
3232
else \
3333
cmake -DCMAKE_BUILD_TYPE=Debug ..; \
3434
fi; \

0 commit comments

Comments
 (0)