Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/use clang 15 on ubuntu builds #1766

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Add/use clang 15 on ubuntu builds #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ed73ed
Add/use clang 15 on ubuntu builds
brndnmtthws Mar 1, 2024
9dee3da
This too
brndnmtthws Mar 1, 2024
a26fb38
Reorder these
brndnmtthws Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .github/workflows/build-and-test-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,38 @@ jobs:
- 12
- 13
- 14
- 15
exclude:
- os: ubuntu-20.04
compiler: gcc
compiler_version: 12
# 9 only exists for gcc
- compiler: clang
compiler_version: 9

# 13, 14, 15 only exist for clang
- compiler: gcc
compiler_version: 13
- compiler: gcc
compiler_version: 14
- compiler: gcc
compiler_version: 15

# ubuntu-20.04
- os: ubuntu-20.04
compiler: gcc
compiler_version: 11
- compiler: clang
compiler_version: 9
- os: ubuntu-20.04
compiler: gcc
compiler_version: 12
- os: ubuntu-20.04
compiler: clang
compiler_version: 13
- os: ubuntu-20.04
compiler: clang
compiler_version: 14
- os: ubuntu-20.04
compiler: clang
compiler_version: 15

# ubuntu-22.04
- os: ubuntu-22.04
compiler: clang
compiler_version: 10
Expand All @@ -56,12 +75,6 @@ jobs:
- os: ubuntu-22.04
compiler: clang
compiler_version: 12
- os: ubuntu-20.04
compiler: clang
compiler_version: 13
- os: ubuntu-20.04
compiler: clang
compiler_version: 14
runs-on: ${{ matrix.os }}
steps:
- run: sudo apt-get -qq update
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-appimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ jobs:
if: matrix.os == 'ubuntu-20.04'
run: |
echo "CLANG_VERSION=12" | tee -a $GITHUB_ENV
- name: Set clang version to 14 for ubuntu-22.04
- name: Set clang version to 15 for ubuntu-22.04
if: matrix.os == 'ubuntu-22.04'
run: |
echo "CLANG_VERSION=14" | tee -a $GITHUB_ENV
echo "CLANG_VERSION=15" | tee -a $GITHUB_ENV
- name: Install libc++, set CC and CXX env vars
run: |
sudo apt-get install -yqq --no-install-recommends \
Expand All @@ -108,13 +108,13 @@ jobs:
- name: Upload AppImage artifact
uses: actions/upload-artifact@v4
with:
name: "conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage"
name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage'
path: conky-x86_64.AppImage
if-no-files-found: error
- name: Upload AppImage checksum artifact
uses: actions/upload-artifact@v4
with:
name: "conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage.sha256"
name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage.sha256'
path: conky-x86_64.AppImage.sha256
if-no-files-found: error
- name: Upload man page artifact
Expand Down