natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Github Actions: Build on Ubuntu 20.04/22.04, not 18.04 any more

This commit is contained in:
Jochen Topf 2022-05-27 11:03:37 +02:00
parent a3f9e58622
commit cffbe661b1
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/c.yml vendored
View File

@ -3,18 +3,6 @@ name: C CI
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
ubuntu18:
runs-on: ubuntu-18.04
env:
CC: gcc
CXX: g++
CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
ubuntu20: ubuntu20:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
@ -27,11 +15,11 @@ jobs:
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
ubuntu20-clang: ubuntu22:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env: env:
CC: clang-10 CC: gcc
CXX: clang++-10 CXX: g++
CXXFLAGS: -Werror -Wall -pedantic CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
@ -39,8 +27,20 @@ jobs:
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
ubuntu20-release: ubuntu22-clang:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env:
CC: clang-12
CXX: clang++-12
CXXFLAGS: -Werror -Wall -pedantic
BUILD_TYPE: Debug
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build
ubuntu22-release:
runs-on: ubuntu-22.04
env: env:
CC: gcc CC: gcc
CXX: g++ CXX: g++
@ -52,8 +52,8 @@ jobs:
- uses: ./.github/actions/install-ubuntu - uses: ./.github/actions/install-ubuntu
- uses: ./.github/actions/build - uses: ./.github/actions/build
ubuntu20-make: ubuntu22-make:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env: env:
CC: gcc CC: gcc
CXX: g++ CXX: g++

34
.github/workflows/java.yml vendored
View File

@ -3,18 +3,6 @@ name: Java CI
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
maven-ubuntu18:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install protobuf-compiler
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Maven
run: mvn -B package --file pom.xml
maven-ubuntu20: maven-ubuntu20:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
@ -27,17 +15,17 @@ jobs:
- name: Build with Maven - name: Build with Maven
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml
ant-ubuntu18: maven-ubuntu22:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo apt-get install protobuf-compiler libprotobuf-java - run: sudo apt-get install protobuf-compiler
- name: Set up JDK 1.8 - name: Set up JDK 1.8
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Build with Ant - name: Build with Maven
run: ant run: mvn -B package --file pom.xml
ant-ubuntu20: ant-ubuntu20:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
@ -51,3 +39,15 @@ jobs:
- name: Build with Ant - name: Build with Ant
run: ant run: ant
ant-ubuntu22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install protobuf-compiler libprotobuf-java
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Ant
run: ant