Skip to content

Commit dc14b56

Browse files
authored
🔀 Merge pull request #403 from cosmoscout/feature/update-build-images
2 parents e5ee18f + 6c82696 commit dc14b56

File tree

76 files changed

+107
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+107
-103
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ on:
1818
jobs:
1919
clang_format:
2020
name: Check Clang-Format
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- name: Checkout Repository
2424
uses: actions/checkout@v4
2525
- name: Checkout Submodules
2626
run: git submodule update --init plugins
27-
- name: Download Clang-Format
28-
run: |
29-
sudo apt-get update -y
30-
sudo apt-get install -y clang-format-11
3127
- name: Run Clang-Format
3228
run: ./tools/clang-format.sh
3329
- name: Compare Results
@@ -45,7 +41,7 @@ jobs:
4541

4642
comment_percentage:
4743
name: Check Comment Percentage
48-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-22.04
4945
if: github.event_name == 'pull_request'
5046
steps:
5147
- name: Checkout Current Repository
@@ -81,8 +77,8 @@ jobs:
8177
fi
8278
8379
build_linux_gcc:
84-
name: Linux GCC 9.3.0
85-
runs-on: ubuntu-20.04
80+
name: Linux GCC 11.4.0
81+
runs-on: ubuntu-22.04
8682
if: >
8783
github.event_name == 'pull_request' ||
8884
( contains(github.ref, 'main') && !contains(github.event.head_commit.message, '[no-ci]') ) ||
@@ -134,15 +130,15 @@ jobs:
134130
path-to-lcov: ./build/linux-Release/coverage.info
135131

136132
build_linux_clang:
137-
name: Linux Clang 11.0
138-
runs-on: ubuntu-20.04
133+
name: Linux Clang 14.0
134+
runs-on: ubuntu-22.04
139135
if: >
140136
github.event_name == 'pull_request' ||
141137
( contains(github.ref, 'main') && !contains(github.event.head_commit.message, '[no-ci]') ) ||
142138
contains(github.event.head_commit.message, '[run-ci]')
143139
env:
144-
CC: clang-11
145-
CXX: clang++-11
140+
CC: clang-14
141+
CXX: clang++-14
146142
COSMOSCOUT_USE_PCH: false
147143
COSMOSCOUT_USE_UNITY_BUILD: false
148144
steps:

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
source_code:
1717
name: Source Code
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Checkout Repository
2121
uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535

3636
release_linux:
3737
name: Linux
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- name: Checkout Repository
4141
uses: actions/checkout@v4

plugins/csl-tools/src/DeletableMark.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CSL_TOOLS_EXPORT DeletableMark : public Mark {
2828
DeletableMark(DeletableMark&& other) = delete;
2929

3030
DeletableMark& operator=(DeletableMark const& other) = delete;
31-
DeletableMark& operator=(DeletableMark&& other) = delete;
31+
DeletableMark& operator=(DeletableMark&& other) = delete;
3232

3333
~DeletableMark() override;
3434

plugins/csl-tools/src/Mark.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ void Mark::initData() {
306306
double height = surface ? surface->getHeight(lngLat) : 0.0;
307307
auto radii = object->getRadii();
308308
mPosition = cs::utils::convert::toCartesian(
309-
lngLat, radii, height * mSettings->mGraphics.pHeightScale.get());
309+
lngLat, radii, height * mSettings->mGraphics.pHeightScale.get());
310310
});
311311

312312
// connect the heightscale value to this object. Whenever the heightscale value changes

plugins/csl-tools/src/Mark.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class CSL_TOOLS_EXPORT Mark : public IVistaOpenGLDraw, public Tool {
5959
Mark(Mark&& other) = default;
6060

6161
Mark& operator=(Mark const& other) = delete;
62-
Mark& operator=(Mark&& other) = delete;
62+
Mark& operator=(Mark&& other) = delete;
6363

6464
~Mark() override;
6565

plugins/csl-tools/src/MultiPointTool.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class CSL_TOOLS_EXPORT MultiPointTool : public Tool {
5050
MultiPointTool(MultiPointTool&& other) = delete;
5151

5252
MultiPointTool& operator=(MultiPointTool const& other) = delete;
53-
MultiPointTool& operator=(MultiPointTool&& other) = delete;
53+
MultiPointTool& operator=(MultiPointTool&& other) = delete;
5454

5555
~MultiPointTool() override;
5656

plugins/csl-tools/src/Tool.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CSL_TOOLS_EXPORT Tool {
4040
Tool(Tool const& other) = default;
4141
Tool(Tool&& other) noexcept = default;
4242

43-
Tool& operator=(Tool const& other) = default;
43+
Tool& operator=(Tool const& other) = default;
4444
Tool& operator=(Tool&& other) noexcept = default;
4545

4646
virtual ~Tool() = default;

plugins/csp-anchor-labels/src/AnchorLabel.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AnchorLabel {
4646
AnchorLabel(AnchorLabel&& other) = delete;
4747

4848
AnchorLabel& operator=(AnchorLabel const& other) = delete;
49-
AnchorLabel& operator=(AnchorLabel&& other) = delete;
49+
AnchorLabel& operator=(AnchorLabel&& other) = delete;
5050

5151
void update();
5252

plugins/csp-lod-bodies/src/BaseTileData.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class BaseTileData {
2828
BaseTileData(BaseTileData&& other) = default;
2929

3030
BaseTileData& operator=(BaseTileData const& other) = delete;
31-
BaseTileData& operator=(BaseTileData&& other) = default;
31+
BaseTileData& operator=(BaseTileData&& other) = default;
3232

3333
/// Returns the enum value for the data type stored in this tile.
3434
virtual TileDataType getDataType() const = 0;

plugins/csp-lod-bodies/src/LodBody.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class LodBody : public cs::scene::CelestialSurface,
4747
LodBody(LodBody&& other) = delete;
4848

4949
LodBody& operator=(LodBody const& other) = delete;
50-
LodBody& operator=(LodBody&& other) = delete;
50+
LodBody& operator=(LodBody&& other) = delete;
5151

5252
~LodBody() override;
5353

0 commit comments

Comments
 (0)