Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-30 02:28:31 +00:00
Code Issues Releases Activity

Add/use clang 15 on ubuntu builds

Browse Source
This commit is contained in:
Brenden Matthews 2024-03-01 08:52:57 -05:00
parent ddb0d70708
commit 10e1e4bc9d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.github/workflows/build-and-test-linux.yaml vendored
View File

@ -34,7 +34,13 @@ jobs:
- 12 - 12
- 13 - 13
- 14 - 14
- 15
exclude: exclude:
# 9 only exists for gcc
- compiler: clang
compiler_version: 9
# ubuntu-20.04
- os: ubuntu-20.04 - os: ubuntu-20.04
compiler: gcc compiler: gcc
compiler_version: 12 compiler_version: 12
@ -45,8 +51,17 @@ jobs:
- os: ubuntu-20.04 - os: ubuntu-20.04
compiler: gcc compiler: gcc
compiler_version: 11 compiler_version: 11
- compiler: clang - os: ubuntu-20.04
compiler_version: 9 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 - os: ubuntu-22.04
compiler: clang compiler: clang
compiler_version: 10 compiler_version: 10
@ -56,12 +71,6 @@ jobs:
- os: ubuntu-22.04 - os: ubuntu-22.04
compiler: clang compiler: clang
compiler_version: 12 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 }} runs-on: ${{ matrix.os }}
steps: steps:
- run: sudo apt-get -qq update - run: sudo apt-get -qq update

8
.github/workflows/publish-appimage.yml vendored
View File

@ -92,10 +92,10 @@ jobs:
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-20.04'
run: | run: |
echo "CLANG_VERSION=12" | tee -a $GITHUB_ENV 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' if: matrix.os == 'ubuntu-22.04'
run: | 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 - name: Install libc++, set CC and CXX env vars
run: | run: |
sudo apt-get install -yqq --no-install-recommends \ sudo apt-get install -yqq --no-install-recommends \
@ -108,13 +108,13 @@ jobs:
- name: Upload AppImage artifact - name: Upload AppImage artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: 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 path: conky-x86_64.AppImage
if-no-files-found: error if-no-files-found: error
- name: Upload AppImage checksum artifact - name: Upload AppImage checksum artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: 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 path: conky-x86_64.AppImage.sha256
if-no-files-found: error if-no-files-found: error
- name: Upload man page artifact - name: Upload man page artifact