From e69b15064f1843748d7bb69fef43718bbbae6c0b Mon Sep 17 00:00:00 2001 From: pantor Date: Sat, 5 Oct 2024 09:17:10 +0200 Subject: [PATCH] modernize ci --- .github/workflows/ci.yml | 29 ++++++++++++++--------------- .github/workflows/documentation.yml | 16 ++++++++-------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd6bd88a..7f937041 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,23 +23,23 @@ jobs: os: ubuntu-20.04 compiler: clang-9 - - name: ubuntu-20.04-clang-11 - os: ubuntu-20.04 - compiler: clang-11 - - name: ubuntu-20.04-clang-12 os: ubuntu-20.04 compiler: clang-12 - - name: ubuntu-20.04-clang-11-no-exceptions - os: ubuntu-20.04 - compiler: clang-11 + - name: ubuntu-22.04-clang-15-no-exceptions + os: ubuntu-22.04 + compiler: clang-15 cmake_vars: "-DCMAKE_CXX_FLAGS=-fno-exceptions -DBUILD_TESTING=OFF -DBUILD_BENCHMARK=ON" - name: ubuntu-22.04-gcc os: ubuntu-22.04 compiler: gcc + - name: ubuntu-24.04-gcc + os: ubuntu-24.04 + compiler: gcc + - name: windows-2019-msvc os: windows-2019 compiler: msvc @@ -60,8 +60,8 @@ jobs: os: macOS-12 compiler: gcc - - name: macOS-12-clang - os: macOS-12 + - name: macOS-13-clang + os: macOS-13 compiler: clang # - name: macOS-14-clang @@ -69,10 +69,10 @@ jobs: # compiler: clang steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Cpp - uses: aminya/setup-cpp@v0.26.2 + uses: aminya/setup-cpp@v0.44.0 with: compiler: ${{ matrix.compiler }} @@ -94,7 +94,7 @@ jobs: check-single-include: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update single include run: | @@ -103,10 +103,9 @@ jobs: - name: Check if equal working-directory: single_include - run: | - diff inja/inja.hpp inja/inja_old.hpp >/dev/null + run: diff inja/inja.hpp inja/inja_old.hpp >/dev/null - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: single_include_inja path: single_include/inja/inja.hpp diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index d1a7ab47..ba9d8f47 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -8,7 +8,7 @@ on: jobs: build-and-deploy: runs-on: ubuntu-latest - + environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} @@ -16,11 +16,11 @@ jobs: permissions: pages: write id-token: write - + steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/configure-pages@v3 + - uses: actions/configure-pages@v5 - name: Install doxygen run: sudo apt-get -y install doxygen @@ -28,12 +28,12 @@ jobs: - name: Build documentation working-directory: doc run: doxygen - + - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: 'doc/html' - + - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4