Merge pull request #9164 from Icinga/feature/gha2133

Update GHA
This commit is contained in:
Julian Brost 2022-01-05 18:30:05 +01:00 committed by GitHub
commit 0a93beaa29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions

View File

@ -24,6 +24,9 @@ jobs:
- name: debian
codename: stretch
has32bit: true
- name: ubuntu
codename: impish
has32bit: false
- name: ubuntu
codename: hirsute
has32bit: false

View File

@ -16,6 +16,7 @@ jobs:
matrix:
codename:
- buster
- bullseye
runs-on: ubuntu-latest
@ -33,6 +34,10 @@ jobs:
- name: qemu-user-static
run: |
set -exo pipefail
. /etc/os-release
if [ "$VERSION_ID" = 20.04 ]; then
sudo perl -pi -e s/focal/impish/g /etc/apt/sources.list
fi
sudo apt-get update
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y qemu-user-static

View File

@ -20,15 +20,15 @@ jobs:
- name: centos
release: 7
- name: fedora
release: 34
release: 35
- name: fedora
release: 33
release: 34
- name: sles
release: '15.2'
release: '15.3'
- name: sles
release: '12.5'
- name: opensuse
release: '15.2'
release: '15.3'
runs-on: ubuntu-latest

View File

@ -432,10 +432,7 @@ if(NOT MSVC)
# ARM settings
if("${ARCH}" STREQUAL "arm")
check_cxx_source_compiles( "include <atomic>; int main(){ std::atomic<uint_fast64_t> x; x.fetch_add(1); x.sub_add(1); }" CXX_ATOMIC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -latomic")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -latomic")
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -latomic")
link_libraries(atomic)
endif()
else()