소스 검색

Remove old Travis leftovers

Ivan Savenko 2 달 전
부모
커밋
ff67bcfed0
3개의 변경된 파일16개의 추가작업 그리고 118개의 파일을 삭제
  1. 3 2
      .github/workflows/github.yml
  2. 0 84
      .travis.yml
  3. 13 32
      CI/get_package_name.sh

+ 3 - 2
.github/workflows/github.yml

@@ -329,7 +329,8 @@ jobs:
         PACKAGE_EXTENSION: ${{ matrix.extension }}
 
   deploy-src:
-    if: always() && github.ref == 'refs/heads/master'
+    name: Deploy Source Code Package
+    if: always() && github.event.number == ''
     runs-on: ubuntu-24.04
     defaults:
       run:
@@ -360,7 +361,7 @@ jobs:
 
   test:
     continue-on-error: true
-    name: Test(${{ matrix.platform }})
+    name: Test (${{ matrix.platform }})
     strategy:
       matrix:
         include:

+ 0 - 84
.travis.yml

@@ -1,84 +0,0 @@
-language: cpp
-os:
-- linux
-- osx
-dist: trusty
-sudo: required
-env:
-  matrix:
-    - ignore=this
-  global:
-  - secure: NMg+qtQB4DIZ/KqlDeIn3K7A7Ydksdpnbv6Ha9n4bSSA0AT8wlPwbHXvQmiR8qYs6cnz4fyY6NVcBe7X3bdR8jWyPNAS0l0QByqG12q3dBpEtNNn0X5u/GS3wHse5+ObNAF9a83+xACTQj2UdxqHgJ3LFGzdBpQt3kLsc8NDnn8=
-
-matrix:
-  exclude:
-  - env: ignore=this
-  include:
-  - os: linux
-    compiler: clang
-    env: VCMI_PLATFORM='linux' REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 PACKAGE=clang-3.6
-      SUPPORT=libstdc++-4.8-dev
-  - os: linux
-    compiler: clang
-    env: VCMI_PLATFORM='linux' REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4
-      SUPPORT=libstdc++-4.8-dev
-  - os: linux
-    compiler: gcc
-    env: VCMI_PLATFORM='linux' REAL_CC=gcc-4.8   REAL_CXX=g++-4.8     PACKAGE=g++-4.8   SUPPORT=
-  - os: linux
-    env: VCMI_PLATFORM='mxe' MXE_TARGET=i686-w64-mingw32.shared VCMI_CMAKE_FLAGS='-DENABLE_TEST=0'
-    sudo: required
-  - os: osx
-    env: VCMI_PLATFORM='mac' VCMI_CMAKE_FLAGS='-DENABLE_TEST=0'
-
-addons:
-  apt:
-    update: true
-  coverity_scan:
-    project:
-      name: vcmi/vcmi
-      description: Build submitted via Travis CI
-    notification_email: [email protected]
-    build_command_prepend: cov-configure --compiler clang-3.6 --comptype clangcc &&
-      cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja ..
-      -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 -DENABLE_EDITOR=0
-    build_command: ninja -j 3
-    branch_pattern: coverity_scan
-
-notifications:
-  email:
-    recipients:
-    - [email protected]
-    on_success: change
-    on_failure: always
-
-before_install:
-- test $TRAVIS_BRANCH != coverity_scan -o ${TRAVIS_JOB_NUMBER##*.} = 1 || exit 0
-- . $TRAVIS_BUILD_DIR/CI/$VCMI_PLATFORM/before_install.sh
-
-before_script:
-- mkdir build
-- cd build
-- if [[ $TRAVIS_BRANCH != 'coverity_scan' ]];
-  then
-    source $TRAVIS_BUILD_DIR/CI/get_package_name.sh;
-    if [[ $VCMI_PLATFORM == 'mxe' ]];
-    then
-      /usr/lib/mxe/usr/bin/i686-w64-mingw32.shared-cmake -G Ninja .. $VCMI_CMAKE_FLAGS
-      -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
-      -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
-    else
-      cmake -G Ninja .. $VCMI_CMAKE_FLAGS
-      -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
-      -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
-    fi
-
-  fi
-  
-script:
-- test $TRAVIS_BRANCH != coverity_scan || exit 0
-- ninja
-
-after_success:
-- test $TRAVIS_BRANCH != coverity_scan || exit 0
-- . $TRAVIS_BUILD_DIR/CI/$VCMI_PLATFORM/upload_package.sh

+ 13 - 32
CI/get_package_name.sh

@@ -1,53 +1,34 @@
 #!/bin/sh
-if [ ! -z "$TRAVIS_JOB_ID" ];
-then
-	echo "Using Travis environment variables!"
-	TMP_JOBID="$TRAVIS_JOB_ID"
-	TMP_BRANCH="$TRAVIS_BRANCH"
-	TMP_PRID="$TRAVIS_PULL_REQUEST"
-	TMP_COMMIT="$TRAVIS_COMMIT"
-elif [ ! -z "${APPVEYOR_JOB_ID}" ];
-then
-	echo "Using AppVeyor environment variables!"
-	TMP_JOBID=$(echo "$APPVEYOR_JOB_ID" | sed 's/[^[:digit:]]\+//g')
-	TMP_BRANCH="$APPVEYOR_REPO_BRANCH"
-	TMP_PRID="$APPVEYOR_PULL_REQUEST_NUMBER"
-	TMP_COMMIT="$APPVEYOR_REPO_COMMIT"
-elif [ ! -z "${GITHUB_RUN_ID}" ];
-then
-	echo "Using Github environment variables!"
-	TMP_JOBID="$GITHUB_RUN_ID"
-	TMP_BRANCH=$(basename ${GITHUB_REF#refs/heads/})
-	TMP_PRID="$PULL_REQUEST"
-	TMP_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-else
-	echo "No Travir or AppVeyor environment variables found!"
-	exit
-fi
+
+echo "Using Github environment variables!"
+TMP_JOBID="$GITHUB_RUN_ID"
+TMP_BRANCH=$(basename ${GITHUB_REF#refs/heads/})
+TMP_PRID="$PULL_REQUEST"
+TMP_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
 
 VCMI_PACKAGE_FILE_NAME="${TMP_JOBID}-vcmi"
 VCMI_PACKAGE_BUILD="${TMP_COMMIT}"
 VCMI_PACKAGE_NAME_SUFFIX=""
 VCMI_PACKAGE_GOLDMASTER="OFF"
-if [ -z "$TMP_PRID" ] || [ "$TMP_PRID" == "false" ];
+if [ -z "$TMP_PRID" ] || [ "$TMP_PRID" == "false" ]
 then
 	branch_name=$(echo "$TMP_BRANCH" | sed 's/[^[:alnum:]]\+/_/g')
 	VCMI_PACKAGE_FILE_NAME="${VCMI_PACKAGE_FILE_NAME}-branch-${branch_name}-${TMP_COMMIT}"
 	if [ "${branch_name}" != "master" ];
 	then
-		VCMI_PACKAGE_NAME_SUFFIX="branch ${branch_name}"
+		VCMI_PACKAGE_NAME_SUFFIX="(branch ${branch_name})"
 	else
 		VCMI_PACKAGE_GOLDMASTER="ON"
 	fi
 else
 	VCMI_PACKAGE_FILE_NAME="${VCMI_PACKAGE_FILE_NAME}-PR-${TMP_PRID}-${TMP_COMMIT}"
-	VCMI_PACKAGE_NAME_SUFFIX="PR ${TMP_PRID}"
+	VCMI_PACKAGE_NAME_SUFFIX="(PR ${TMP_PRID})"
 fi
 
-if [ "${VCMI_PACKAGE_NAME_SUFFIX}" != "" ];
-then
-	VCMI_PACKAGE_NAME_SUFFIX="(${VCMI_PACKAGE_NAME_SUFFIX})"
-fi
+echo "VCMI_PACKAGE_FILE_NAME=${VCMI_PACKAGE_FILE_NAME}"
+echo "VCMI_PACKAGE_BUILD=${VCMI_PACKAGE_BUILD}"
+echo "VCMI_PACKAGE_NAME_SUFFIX=${VCMI_PACKAGE_NAME_SUFFIX}"
+echo "VCMI_PACKAGE_GOLDMASTER=${VCMI_PACKAGE_GOLDMASTER}"
 
 export VCMI_PACKAGE_FILE_NAME
 export VCMI_PACKAGE_BUILD