From e72b6c9cd1bc9f22221ec1be53b5b69f478ce8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= Date: Tue, 7 Jan 2025 13:05:33 +0200 Subject: [PATCH] drop script --- .github/workflows/build-and-test.yml | 48 ++++++++++++++++++++++------ cmake/ctest/utils.ctest | 17 +++++----- cmake_configure.cmake | 6 ++-- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d063e7497..c046df54b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,23 +2,51 @@ name: Build and Test on: push: - branches: [ "master", "migrate-ci" ] + branches: [ "main", "migrate-ci" ] pull_request: - branches: [ "master" ] + branches: [ "main" ] + # Allow to run manually + workflow_dispatch: env: BUILD_TYPE: Release + XDG_RUNTIME_DIR: /tmp jobs: - build-and-test: + # fedora-build-and-test: + # runs-on: ubuntu-latest + # container: + # image: quay.io/fedora/fedora:latest + # steps: + # - name: Install dependencies + # run: | + # dnf install -y git-core boost-devel gcc gcc-c++ clang llvm lcov curl \ + # boost-devel cmake make ninja-build bullet-devel ffmpeg-free-devel \ + # glm-devel openal-soft-devel SDL2-devel qt5-qtbase-devel \ + # freetype-devel libasan + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # submodules: recursive + # - name: Build and test + # run: mkdir build && cd build && ctest -VV -S ../cmake/ctest/script_ci.ctest + ubuntu-build-and-test: runs-on: ubuntu-latest - strategy: - matrix: - distro: [ "ubuntu", "fedora", "archlinux" ] steps: + - name: Install dependencies + run: | + apt-get update && \ + apt-get install --no-install-recommends --no-upgrade -y \ + git-core build-essential cmake ninja-build clang llvm lcov curl \ + libavcodec-dev libavformat-dev libboost-program-options-dev \ + libboost-system-dev libbullet-dev libglm-dev libopenal-dev \ + libsdl2-dev libboost-test-dev libqt5opengl5-dev libfreetype6-dev \ + iwyu qtbase5-dev qt5-qmake + env: + DEBIAN_FRONTEND: noninteractive - name: Checkout uses: actions/checkout@v4 - - name: Install dependencies - run: sudo apt-get update && sudo apt-get install -yq python3 - - name: Build and Test - run: scripts/docker/docker_travis.sh "${{ matrix.distro }}_latest.docker" \ No newline at end of file + with: + submodules: recursive + - name: Build and test + run: mkdir build && cd build && ctest -VV -S ../cmake/ctest/script_ci.ctest \ No newline at end of file diff --git a/cmake/ctest/utils.ctest b/cmake/ctest/utils.ctest index 814007a81..889782272 100644 --- a/cmake/ctest/utils.ctest +++ b/cmake/ctest/utils.ctest @@ -74,14 +74,15 @@ function(openrw_build_name BUILDER_NAME_RES BUILD_NAME_RES) endif() if(MODEL_NAME STREQUAL "continuous") - if("$ENV{TRAVIS}") - message(STATUS "Travis detected") - set(BUILDER_NAME "Travis") - set(REPO_NAME "$ENV{TRAVIS_REPO_SLUG}") - set(REPO_BRANCH "$ENV{TRAVIS_BRANCH}") - set(GIT_HASH "$ENV{TRAVIS_COMMIT}") - set(_EVENT_TYPE "$ENV{TRAVIS_EVENT_TYPE}") - set(SUBMIT TRUE) + if("$ENV{GITHUB_ACTIONS}") + message(STATUS "GitHub Actions detected") + set(BUILDER_NAME "GitHub Actions") + set(REPO_NAME "$ENV{GITHUB_REPOSITORY}") + set(REPO_BRANCH "$ENV{GITHUB_REF}") + set(GIT_HASH "$ENV{GITHUB_SHA}") + set(_EVENT_TYPE "$ENV{GITHUB_EVENT_NAME}") + # FIXME: enable submit + set(SUBMIT FALSE) elseif("$ENV{APPVEYOR}") message(STATUS "AppVeyor detected") set(BUILDER_NAME "AppVeyor") diff --git a/cmake_configure.cmake b/cmake_configure.cmake index 8d0db9d4f..9a6533f1e 100644 --- a/cmake_configure.cmake +++ b/cmake_configure.cmake @@ -144,9 +144,9 @@ if(TEST_COVERAGE) if(_RE_REFSPEC) set(GIT_BRANCH "${CMAKE_MATCH_1}") message(STATUS "Git branch detected from .git directory: ${GIT_BRANCH}") - elseif(DEFINED ENV{TRAVIS_BRANCH}) - set(GIT_BRANCH "$ENV{TRAVIS_BRANCH}") - message(STATUS "Git branch detected from TRAVIS_BRANCH environment variable: ${GIT_BRANCH}") + elseif(DEFINED ENV{GITHUB_REF}) + set(GIT_BRANCH "$ENV{GITHUB_REF}") + message(STATUS "Git branch detected from GITHUB_BRANCH environment variable: ${GIT_BRANCH}") else() message("Git branch unknown: uploading coverage might nog work") endif()