From f87909ec24e5521d6514a97d51ccfec368530d89 Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Fri, 19 Jul 2024 16:54:23 +0200 Subject: [PATCH 1/2] [DOC] Remove vercel --- README.md | 6 --- test/documentation/.vercel/README.md | 15 ------- test/documentation/.vercel/build.sh | 33 -------------- test/documentation/.vercel/index.html | 22 ---------- test/documentation/.vercel/install.sh | 36 --------------- .../.vercel/powered-by-vercel.svg | 9 ---- test/documentation/.vercel/vercel.css | 44 ------------------- test/documentation/seqan3-doxygen.cmake | 10 ----- test/documentation/seqan3_doxygen_cfg.in | 4 -- test/documentation/seqan3_footer.html.in | 1 - 10 files changed, 180 deletions(-) delete mode 100644 test/documentation/.vercel/README.md delete mode 100755 test/documentation/.vercel/build.sh delete mode 100644 test/documentation/.vercel/index.html delete mode 100755 test/documentation/.vercel/install.sh delete mode 100644 test/documentation/.vercel/powered-by-vercel.svg delete mode 100644 test/documentation/.vercel/vercel.css diff --git a/README.md b/README.md index 79a9f63617..124b87810e 100644 --- a/README.md +++ b/README.md @@ -104,9 +104,3 @@ g++-11 -O3 -DNDEBUG -Wall -Wextra \ -lz -lbz2 -pthread \ your_file.cpp ``` - -## Sponsorships - -[![Vercel](https://raw.githubusercontent.com/seqan/seqan3/main/test/documentation/.vercel/powered-by-vercel.svg)](https://vercel.com/?utm_source=seqan&utm_campaign=oss) - -Vercel is kind enough to sponsor our documentation preview-builds within our pull requests. Check them out! diff --git a/test/documentation/.vercel/README.md b/test/documentation/.vercel/README.md deleted file mode 100644 index dae6af7e14..0000000000 --- a/test/documentation/.vercel/README.md +++ /dev/null @@ -1,15 +0,0 @@ - - -How to setup vercel.com: - -* In vercel.com go create a new project. -* Import it from the git repository. -* Select personal account -* Give it a Project Name and select Framework Preset to Other -* Set Output Directory to "./export" -* Set Build Command to "./test/documentation/.vercel/build.sh" -* This option needs to be changed in the settings of the project: - * Set Install Command to "./test/documentation/.vercel/install.sh" diff --git a/test/documentation/.vercel/build.sh b/test/documentation/.vercel/build.sh deleted file mode 100755 index ec979d56f0..0000000000 --- a/test/documentation/.vercel/build.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin -# SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik -# SPDX-License-Identifier: BSD-3-Clause - -set -exo pipefail - -SOURCE_DIR=`pwd` -CACHE_DIR="${SOURCE_DIR}/node_modules" -BUILD_DIR="${CACHE_DIR}/build" -EXPORT_DIR="${SOURCE_DIR}/export" -PATH="$PATH:${SOURCE_DIR}/doxygen-bin" - -# Print versions. -${SOURCE_DIR}/doxygen-bin/doxygen --version -cmake3 --version -doxygen --version - -# Configure documentation build. -mkdir -p "${BUILD_DIR}" && cd "${BUILD_DIR}" -cmake3 -DSEQAN3_VERCEL_PREVIEW_DOC=ON -DCMAKE_INSTALL_PREFIX="" -DCMAKE_INSTALL_DOCDIR="." "${SOURCE_DIR}/test/documentation" 1>/dev/null - -# Build documentation. -cmake3 --build . --target download-cppreference-doxygen-web-tag 1>/dev/null -ctest3 -j 2 --output-on-failure . - -# Install documentation. -mkdir -p "${EXPORT_DIR}/usr/" "${EXPORT_DIR}/dev/" -DESTDIR="${EXPORT_DIR}/usr/" cmake3 -DCOMPONENT=doc -P cmake_install.cmake 1>/dev/null -DESTDIR="${EXPORT_DIR}/dev/" cmake3 -DCOMPONENT=doc-dev -P cmake_install.cmake 1>/dev/null -cp "${SOURCE_DIR}/test/documentation/.vercel/index.html" "${EXPORT_DIR}/index.html" -cp "${SOURCE_DIR}/test/documentation/.vercel/vercel.css" "${EXPORT_DIR}/vercel.css" diff --git a/test/documentation/.vercel/index.html b/test/documentation/.vercel/index.html deleted file mode 100644 index ce5f127a2c..0000000000 --- a/test/documentation/.vercel/index.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SeqAn Documentation Preview - - - - -

SeqAn Documentation Preview - - - -

- - User Documentation Preview - Developer Documentation Preview - - diff --git a/test/documentation/.vercel/install.sh b/test/documentation/.vercel/install.sh deleted file mode 100755 index 86e5412888..0000000000 --- a/test/documentation/.vercel/install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin -# SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik -# SPDX-License-Identifier: BSD-3-Clause - -set -exo pipefail - -DOXYGEN_VERSION=1.9.8 -SOURCE_DIR=`pwd` -CACHE_DIR="${SOURCE_DIR}/node_modules" - -# Install dependencies. -yum --assumeyes --quiet install wget cmake3 flex bison xz graphviz - -# Download doxygen. -mkdir -p ${CACHE_DIR}/doxygen-download -wget --retry-connrefused --waitretry=30 --read-timeout=30 --timeout=30 --tries=20 --no-clobber --quiet --directory-prefix=${CACHE_DIR}/doxygen-download/ https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.src.tar.gz -tar -C ${CACHE_DIR}/doxygen-download -zxf ${CACHE_DIR}/doxygen-download/doxygen-${DOXYGEN_VERSION}.src.tar.gz - -# Configure doxygen. -cd ${CACHE_DIR}/doxygen-download/doxygen-${DOXYGEN_VERSION} -mkdir -p build && cd build -if ! cmake3 -G "Unix Makefiles" .. 1>/dev/null; then - rm -rf * - cmake3 -G "Unix Makefiles" .. 1>/dev/null -fi - -# Build doxygen. -make -j 4 1>/dev/null - -# Install doxygen -make install DESTDIR=${CACHE_DIR}/doxygen-${DOXYGEN_VERSION} 1>/dev/null - -# Symlink doxygen. -ln -s ${CACHE_DIR}/doxygen-${DOXYGEN_VERSION}/usr/local/bin ${SOURCE_DIR}/doxygen-bin diff --git a/test/documentation/.vercel/powered-by-vercel.svg b/test/documentation/.vercel/powered-by-vercel.svg deleted file mode 100644 index f0e4fd3b49..0000000000 --- a/test/documentation/.vercel/powered-by-vercel.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/test/documentation/.vercel/vercel.css b/test/documentation/.vercel/vercel.css deleted file mode 100644 index 5389e3e7c4..0000000000 --- a/test/documentation/.vercel/vercel.css +++ /dev/null @@ -1,44 +0,0 @@ -/* SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin - SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik - SPDX-License-Identifier: BSD-3-Clause -*/ - -@media (prefers-color-scheme: dark) { - :root { - --background-color: black; - } -} - -@media (prefers-color-scheme: light) { - :root { - --background-color: rgb(230, 230, 230); - } -} - -body { - background-color: var(--background-color); - text-align: center; -} - -h1 { - color: rgb(135,135,135); -} - -a.selection { - height: 2em; - display: inline-block; - border-radius: 4px; - background: #090D16; - color: #C9D1D9; - line-height: 2em; - padding: 5px; - width: 50%; - font-size: 1.5em; - text-decoration: none; - margin: 5px; -} - -a.selection:hover { - background-color: #776700; - text-decoration: underline; -} diff --git a/test/documentation/seqan3-doxygen.cmake b/test/documentation/seqan3-doxygen.cmake index cca377ffa5..9eb5618634 100644 --- a/test/documentation/seqan3-doxygen.cmake +++ b/test/documentation/seqan3-doxygen.cmake @@ -32,16 +32,6 @@ set (SEQAN3_LAYOUT_IN ${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml.in) option (SEQAN3_USER_DOC "Create build target and test for user documentation." ON) option (SEQAN3_DEV_DOC "Create build target and test for developer documentation." ON) -option (SEQAN3_VERCEL_PREVIEW_DOC "Is this a preview build by vercel.com?" OFF) - -if (SEQAN3_VERCEL_PREVIEW_DOC) - set (SEQAN3_DOXYGEN_DOT_NUM_THREADS "2") - set (SEQAN3_DOXYFILE_OPTION_POWERED_BY_VERCEL - "HTML_EXTRA_FILES += ${SEQAN3_DOXYGEN_SOURCE_DIR}/test/documentation/.vercel/powered-by-vercel.svg") - set (SEQAN3_FOOTER_HTML_OPTION_POWERED_BY_VERCEL - "
  • Powered by Vercel
    • " - ) -endif () ### Download and extract cppreference-doxygen-web.tag.xml for std:: documentation links # SEQAN3_DOXYGEN_STD_TAGFILE can be used to point to an existing tag file (cppreference-doxygen-web.tag.xml). diff --git a/test/documentation/seqan3_doxygen_cfg.in b/test/documentation/seqan3_doxygen_cfg.in index b569fd57b3..5ad92b5ee7 100644 --- a/test/documentation/seqan3_doxygen_cfg.in +++ b/test/documentation/seqan3_doxygen_cfg.in @@ -407,7 +407,3 @@ GENERATE_LEGEND = YES DOT_CLEANUP = YES MSCGEN_TOOL = MSCFILE_DIRS = -#--------------------------------------------------------------------------- -# Configuration options related to the deployment by Vercel -#--------------------------------------------------------------------------- -${SEQAN3_DOXYFILE_OPTION_POWERED_BY_VERCEL} diff --git a/test/documentation/seqan3_footer.html.in b/test/documentation/seqan3_footer.html.in index ec953a3ad0..9ff969937d 100644 --- a/test/documentation/seqan3_footer.html.in +++ b/test/documentation/seqan3_footer.html.in @@ -14,7 +14,6 @@
  • $navpath - ${SEQAN3_FOOTER_HTML_OPTION_POWERED_BY_VERCEL}
  • $generatedby doxygen $doxygenversion
    • From 6c8d421243cfaa9cee1beb36bae181b70cfaeddb Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Fri, 19 Jul 2024 16:54:57 +0200 Subject: [PATCH 2/2] [MISC] Prepare for clang-format 18 --- .github/workflows/ci_lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_lint.yml b/.github/workflows/ci_lint.yml index 6f8983e3b1..8654ca3d91 100644 --- a/.github/workflows/ci_lint.yml +++ b/.github/workflows/ci_lint.yml @@ -82,7 +82,7 @@ jobs: - name: Run lint uses: seqan/actions/lint@main with: - clang_format: 15 + clang_format: 18 token: ${{ secrets.SEQAN_ACTIONS_PAT }} gpg_key: ${{ secrets.SEQAN_ACTIONS_GPG_KEY }} gpg_passphrase: ${{ secrets.SEQAN_ACTIONS_GPG_PASSPHRASE }}