Skip to content

Commit bbd98ac

Browse files
Fix development branch from being out of sync + set linux CI version to 22.04 for glib 2.35 (#37)
* 5.1.0 (#32) v5.1.0 * Release 5.1.0 (#34) * increment version to 5.1.0 * add release notes in CHANGELOG file --------- Co-authored-by: Dorin <[email protected]> * set ubuntu 22.04 * Update cmake.yml * Update cmake.yml --------- Co-authored-by: dorin-ga <[email protected]> Co-authored-by: Dorin <[email protected]>
1 parent d8d84d2 commit bbd98ac

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

.github/workflows/cmake.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ jobs:
3131
#
3232
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
3333
matrix:
34-
os: [ubuntu-latest, windows-latest, macOS-latest]
34+
os: [ubuntu-22.04, windows-latest, macOS-latest]
3535
build_type: ${{ fromJSON(format('[{0}]', inputs.build_type || '"Debug","Release"')) }}
3636
c_compiler: [gcc, clang, cl]
3737
include:
3838
- os: windows-latest
3939
c_compiler: cl
4040
cpp_compiler: cl
41-
- os: ubuntu-latest
41+
- os: ubuntu-22.04
4242
c_compiler: gcc
4343
cpp_compiler: g++
44-
- os: ubuntu-latest
44+
- os: ubuntu-22.04
4545
c_compiler: clang
4646
cpp_compiler: clang++
4747
- os: macOS-latest
@@ -52,7 +52,7 @@ jobs:
5252
c_compiler: gcc
5353
- os: windows-latest
5454
c_compiler: clang
55-
- os: ubuntu-latest
55+
- os: ubuntu-22.04
5656
c_compiler: cl
5757
- os: macOS-latest
5858
c_compiler: cl
@@ -71,22 +71,8 @@ jobs:
7171
run: |
7272
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
7373
74-
- name: Install Clang and Libraries
75-
if: matrix.os == 'ubuntu-latest' && matrix.c_compiler == 'clang'
76-
run: |
77-
sudo apt-get update
78-
sudo apt-get install -y clang libc++-dev libc++abi-dev
79-
80-
- name: Set Clang 16 as Default
81-
if: matrix.os == 'ubuntu-24.04' && matrix.c_compiler == 'clang'
82-
run: |
83-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
84-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
85-
sudo update-alternatives --set clang /usr/bin/clang-16
86-
sudo update-alternatives --set clang++ /usr/bin/clang++-16
87-
8874
- name: Check Clang Settings
89-
if: matrix.os == 'ubuntu-latest' && matrix.c_compiler == 'clang'
75+
if: matrix.os == 'ubuntu-22.04' && matrix.c_compiler == 'clang'
9076
run: |
9177
clang --version
9278
clang++ --version

0 commit comments

Comments
 (0)