Skip to content

Commit

Permalink
Add Noble
Browse files Browse the repository at this point in the history
  • Loading branch information
kees-jan committed Jun 15, 2024
1 parent c0294e8 commit 5221cba
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-22.04, ubuntu-20.04 ]
os: [ ubuntu-24.04, ubuntu-22.04 ]
type: [ RelWithDebInfo, Debug ]
fail-fast: false
env:
Expand All @@ -28,7 +28,7 @@ jobs:
submodules: recursive

- name: ccache cache files
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .ccache
key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}-ccache-${{ github.run_id }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
# and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: |
cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10
cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE
- name: Build
working-directory: ${{runner.workspace}}/build
Expand Down Expand Up @@ -113,12 +113,14 @@ jobs:
build_scripts\github\mingwdo
build_scripts/github/build-cmake-mingw
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Sources
path: Scroom-*Source.tar.gz

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows-portable-executable
path: scroom-win-*.zip

build-many-ubuntus:
Expand Down
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion libs/util/inc/scroom/gtk-helpers.hh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace Scroom::GtkHelpers
template <typename T>
void async_on_ui_thread(T f)
{
const auto& [function, data] = wrap(std::move(f));
const auto [function, data] = wrap(std::move(f));
gdk_threads_add_idle(function, data);
}

Expand Down

0 comments on commit 5221cba

Please sign in to comment.