Github action: Modernize/fix CI

This commit is contained in:
Jochen Topf 2026-07-26 16:49:46 +02:00
parent 0265ab5f3d
commit 30db69822d
3 changed files with 53 additions and 15 deletions

View File

@ -19,6 +19,6 @@ runs:
working-directory: build working-directory: build
- name: Run outline - name: Run outline
run: build/tools/osmpbf-outline resources/sample.pbf run: build/demo/osmpbf-outline resources/sample.pbf
shell: bash shell: bash

View File

@ -11,7 +11,7 @@ jobs:
CXXFLAGS: -Werror -Wall -pedantic CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
@ -23,7 +23,19 @@ jobs:
CXXFLAGS: -Werror -Wall -pedantic CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
ubuntu26:
runs-on: ubuntu-26.04
env:
CC: gcc
CXX: g++
CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug
steps:
- uses: actions/checkout@v7
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
@ -35,7 +47,7 @@ jobs:
CXXFLAGS: -Werror -Wall -pedantic CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
@ -48,7 +60,7 @@ jobs:
CXXFLAGS: -Werror -Wall -pedantic -Wno-array-bounds CXXFLAGS: -Werror -Wall -pedantic -Wno-array-bounds
BUILD_TYPE: Release BUILD_TYPE: Release
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
@ -60,14 +72,14 @@ jobs:
CXXFLAGS: -Werror -Wall -pedantic -Wno-nullability-extension CXXFLAGS: -Werror -Wall -pedantic -Wno-nullability-extension
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-macos - uses: ./.github/actions/install-macos
- uses: ./.github/actions/build - uses: ./.github/actions/build
windows: windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: ./.github/actions/install-windows - uses: ./.github/actions/install-windows
- uses: ./.github/actions/build-windows - uses: ./.github/actions/build-windows

View File

@ -6,10 +6,10 @@ jobs:
maven-ubuntu22: maven-ubuntu22:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler - run: sudo apt-get install protobuf-compiler
- name: Set up JDK 8 - name: Set up JDK 8
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with: with:
distribution: zulu distribution: zulu
java-version: 8 java-version: 8
@ -19,10 +19,23 @@ jobs:
maven-ubuntu24: maven-ubuntu24:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler - run: sudo apt-get install protobuf-compiler
- name: Set up JDK 8 - name: Set up JDK 8
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 8
- name: Build with Maven
run: mvn -B package --file pom.xml
maven-ubuntu26:
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler
- name: Set up JDK 8
uses: actions/setup-java@v5
with: with:
distribution: zulu distribution: zulu
java-version: 8 java-version: 8
@ -32,10 +45,10 @@ jobs:
ant-ubuntu22: ant-ubuntu22:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler libprotobuf-java - run: sudo apt-get install protobuf-compiler libprotobuf-java
- name: Set up JDK 8 - name: Set up JDK 8
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with: with:
distribution: zulu distribution: zulu
java-version: 8 java-version: 8
@ -45,10 +58,23 @@ jobs:
ant-ubuntu24: ant-ubuntu24:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler libprotobuf-java - run: sudo apt-get install protobuf-compiler libprotobuf-java
- name: Set up JDK 8 - name: Set up JDK 8
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 8
- name: Build with Ant
run: ant
ant-ubuntu26:
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v7
- run: sudo apt-get install protobuf-compiler libprotobuf-java
- name: Set up JDK 8
uses: actions/setup-java@v5
with: with:
distribution: zulu distribution: zulu
java-version: 8 java-version: 8