Skip to content

Commit 2493d50

Browse files
committed
Github action: Update scripts
1 parent fc0128b commit 2493d50

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed
+4-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
name: Install Prerequisites on macOS
1+
name: Install homebrew packages on macOS
22

33
runs:
44
using: composite
55
steps:
66
- name: Install homebrew packages
77
run: |
8-
brew install gdal spatialite-tools
9-
shell: bash
10-
- name: Install from git
11-
run: |
12-
git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git ../libosmium
13-
git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
8+
brew install \
9+
gdal \
10+
spatialite-tools
1411
shell: bash
1512

.github/actions/install-ubuntu/action.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Install Prerequisites on Ubuntu
1+
name: Install apt packages on Ubuntu/Debian
22

33
runs:
44
using: composite
@@ -13,9 +13,4 @@ runs:
1313
pandoc \
1414
spatialite-bin
1515
shell: bash
16-
- name: Install from git
17-
run: |
18-
git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git ../libosmium
19-
git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
20-
shell: bash
2116

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ jobs:
193193
steps:
194194
- uses: actions/checkout@v4
195195
- uses: ./.github/actions/install-ubuntu
196+
- uses: ./.github/actions/install-from-git
196197
- uses: ./.github/actions/cmake
197198
- uses: ./.github/actions/build
198199
- uses: ./.github/actions/ctest
@@ -216,6 +217,7 @@ jobs:
216217
steps:
217218
- uses: actions/checkout@v4
218219
- uses: ./.github/actions/install-macos
220+
- uses: ./.github/actions/install-from-git
219221
- uses: ./.github/actions/cmake
220222
- uses: ./.github/actions/build
221223
- uses: ./.github/actions/ctest

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ all the pieces into polygons for use in map renderers etc.
66

77
https://osmcode.org/osmcoastline
88

9-
[![Build Status](https://github.com/osmcode/osmcoastline/workflows/CI/badge.svg?branch=master)](https://github.com/osmcode/osmcoastline/actions)
9+
[![Build Status](https://github.com/osmcode/osmcoastline/actions/workflows/ci.yml/badge.svg)](https://github.com/osmcode/osmcoastline/actions)
1010

1111
## Prerequisites
1212

0 commit comments

Comments
 (0)