Skip to content

Commit 5f46d5d

Browse files
committed
drop script
1 parent 66fbb42 commit 5f46d5d

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

.github/workflows/build-and-test.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,32 @@ name: Build and Test
22

33
on:
44
push:
5-
branches: [ "master", "migrate-ci" ]
5+
branches: [ "main", "migrate-ci" ]
66
pull_request:
7-
branches: [ "master" ]
7+
branches: [ "main" ]
8+
# Allow to run manually
9+
workflow_dispatch:
810

911
env:
1012
BUILD_TYPE: Release
1113

1214
jobs:
1315
build-and-test:
1416
runs-on: ubuntu-latest
15-
strategy:
16-
matrix:
17-
distro: [ "ubuntu", "fedora", "archlinux" ]
17+
container:
18+
image: quay.io/fedora/fedora:latest
19+
env:
20+
XDG_RUNTIME_DIR: /tmp
1821
steps:
22+
- name: Install dependencies
23+
run: |
24+
dnf install -y git-core boost-devel gcc gcc-c++ clang llvm lcov curl \
25+
boost-devel cmake make ninja-build bullet-devel ffmpeg-free-devel \
26+
glm-devel openal-soft-devel SDL2-devel qt5-qtbase-devel \
27+
freetype-devel libasan
1928
- name: Checkout
2029
uses: actions/checkout@v4
21-
- name: Install dependencies
22-
run: sudo apt-get update && sudo apt-get install -yq python3
23-
- name: Build and Test
24-
run: scripts/docker/docker_travis.sh "${{ matrix.distro }}_latest.docker"
30+
with:
31+
submodules: recursive
32+
- name: Build and test
33+
run: mkdir build && cd build && ctest -VV -S ../cmake/ctest/script_ci.ctest

cmake/ctest/utils.ctest

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@ function(openrw_build_name BUILDER_NAME_RES BUILD_NAME_RES)
7474
endif()
7575

7676
if(MODEL_NAME STREQUAL "continuous")
77-
if("$ENV{TRAVIS}")
78-
message(STATUS "Travis detected")
79-
set(BUILDER_NAME "Travis")
80-
set(REPO_NAME "$ENV{TRAVIS_REPO_SLUG}")
81-
set(REPO_BRANCH "$ENV{TRAVIS_BRANCH}")
82-
set(GIT_HASH "$ENV{TRAVIS_COMMIT}")
83-
set(_EVENT_TYPE "$ENV{TRAVIS_EVENT_TYPE}")
84-
set(SUBMIT TRUE)
77+
if("$ENV{GITHUB_ACTIONS}")
78+
message(STATUS "GitHub Actions detected")
79+
set(BUILDER_NAME "GitHub Actions")
80+
set(REPO_NAME "$ENV{GITHUB_REPOSITORY}")
81+
set(REPO_BRANCH "$ENV{GITHUB_REF}")
82+
set(GIT_HASH "$ENV{GITHUB_SHA}")
83+
set(_EVENT_TYPE "$ENV{GITHUB_EVENT_NAME}")
84+
# FIXME: enable submit
85+
set(SUBMIT FALSE)
8586
elseif("$ENV{APPVEYOR}")
8687
message(STATUS "AppVeyor detected")
8788
set(BUILDER_NAME "AppVeyor")

cmake_configure.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ if(TEST_COVERAGE)
144144
if(_RE_REFSPEC)
145145
set(GIT_BRANCH "${CMAKE_MATCH_1}")
146146
message(STATUS "Git branch detected from .git directory: ${GIT_BRANCH}")
147-
elseif(DEFINED ENV{TRAVIS_BRANCH})
148-
set(GIT_BRANCH "$ENV{TRAVIS_BRANCH}")
149-
message(STATUS "Git branch detected from TRAVIS_BRANCH environment variable: ${GIT_BRANCH}")
147+
elseif(DEFINED ENV{GITHUB_REF})
148+
set(GIT_BRANCH "$ENV{GITHUB_REF}")
149+
message(STATUS "Git branch detected from GITHUB_BRANCH environment variable: ${GIT_BRANCH}")
150150
else()
151151
message("Git branch unknown: uploading coverage might nog work")
152152
endif()

0 commit comments

Comments
 (0)