From 6fd79c65e725065870c3959a8cae21f8395a10a2 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Wed, 16 Feb 2022 08:11:27 -0800 Subject: [PATCH] chore(CI): Remove travis config and directory Move all CI scripts to generic .ci-scripts dir --- {.travis => .ci-scripts}/build-docs.sh | 0 {.travis => .ci-scripts}/build-gitstats.sh | 0 {.travis => .ci-scripts}/build-osx.sh | 0 {.travis => .ci-scripts}/build-qtox-linux.sh | 0 {.travis => .ci-scripts}/build-windows.sh | 0 {.travis => .ci-scripts}/deploy-docs.sh | 0 {.travis => .ci-scripts}/deploy-gitstats.sh | 0 {.travis => .ci-scripts}/lcov.sh | 0 .../verify-commit-format.sh | 0 .github/workflows/build-test-deploy.yaml | 22 +- .github/workflows/commit-format.yaml | 2 +- .travis.yml | 300 ------------------ 12 files changed, 12 insertions(+), 312 deletions(-) rename {.travis => .ci-scripts}/build-docs.sh (100%) rename {.travis => .ci-scripts}/build-gitstats.sh (100%) rename {.travis => .ci-scripts}/build-osx.sh (100%) rename {.travis => .ci-scripts}/build-qtox-linux.sh (100%) rename {.travis => .ci-scripts}/build-windows.sh (100%) rename {.travis => .ci-scripts}/deploy-docs.sh (100%) rename {.travis => .ci-scripts}/deploy-gitstats.sh (100%) rename {.travis => .ci-scripts}/lcov.sh (100%) rename {.travis => .ci-scripts}/verify-commit-format.sh (100%) delete mode 100644 .travis.yml diff --git a/.travis/build-docs.sh b/.ci-scripts/build-docs.sh similarity index 100% rename from .travis/build-docs.sh rename to .ci-scripts/build-docs.sh diff --git a/.travis/build-gitstats.sh b/.ci-scripts/build-gitstats.sh similarity index 100% rename from .travis/build-gitstats.sh rename to .ci-scripts/build-gitstats.sh diff --git a/.travis/build-osx.sh b/.ci-scripts/build-osx.sh similarity index 100% rename from .travis/build-osx.sh rename to .ci-scripts/build-osx.sh diff --git a/.travis/build-qtox-linux.sh b/.ci-scripts/build-qtox-linux.sh similarity index 100% rename from .travis/build-qtox-linux.sh rename to .ci-scripts/build-qtox-linux.sh diff --git a/.travis/build-windows.sh b/.ci-scripts/build-windows.sh similarity index 100% rename from .travis/build-windows.sh rename to .ci-scripts/build-windows.sh diff --git a/.travis/deploy-docs.sh b/.ci-scripts/deploy-docs.sh similarity index 100% rename from .travis/deploy-docs.sh rename to .ci-scripts/deploy-docs.sh diff --git a/.travis/deploy-gitstats.sh b/.ci-scripts/deploy-gitstats.sh similarity index 100% rename from .travis/deploy-gitstats.sh rename to .ci-scripts/deploy-gitstats.sh diff --git a/.travis/lcov.sh b/.ci-scripts/lcov.sh similarity index 100% rename from .travis/lcov.sh rename to .ci-scripts/lcov.sh diff --git a/.travis/verify-commit-format.sh b/.ci-scripts/verify-commit-format.sh similarity index 100% rename from .travis/verify-commit-format.sh rename to .ci-scripts/verify-commit-format.sh diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 734e180e7..ef314bd03 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -107,7 +107,7 @@ jobs: with: docker_image_name: almalinux - name: Run build - run: docker-compose run --rm almalinux ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm almalinux ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} build-fedora: name: Fedora runs-on: ubuntu-latest @@ -123,7 +123,7 @@ jobs: with: docker_image_name: fedora - name: Run build - run: docker-compose run --rm fedora ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm fedora ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} build-opensuse: name: Opensuse runs-on: ubuntu-latest @@ -139,7 +139,7 @@ jobs: with: docker_image_name: opensuse - name: Run build - run: docker-compose run --rm opensuse ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm opensuse ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} build-debian: name: Debian runs-on: ubuntu-latest @@ -155,7 +155,7 @@ jobs: with: docker_image_name: debian - name: Run build - run: docker-compose run --rm debian ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm debian ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} build-debian-old: name: Debian Old runs-on: ubuntu-latest @@ -171,7 +171,7 @@ jobs: with: docker_image_name: debian_old - name: Run build - run: docker-compose run --rm debian_old ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm debian_old ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} build-ubuntu: name: Ubuntu LTS runs-on: ubuntu-latest @@ -187,12 +187,12 @@ jobs: with: docker_image_name: ubuntu_lts - name: Run build - run: docker-compose run --rm ubuntu_lts ./.travis/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} + run: docker-compose run --rm ubuntu_lts ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} - name: Code coverage run: | # https://github.com/actions/runner/issues/491 if [ "${{ matrix.build_type }}" == "Release" ] && [ "${{ matrix.features }}" == "full" ]; then - docker-compose run --rm ubuntu_lts ./.travis/lcov.sh + docker-compose run --rm ubuntu_lts ./.ci-scripts/lcov.sh # Upload report to codecov.io bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports" fi @@ -469,7 +469,7 @@ jobs: - name: Install toxcore and toxext run: buildscripts/build_toxcore_linux.sh - name: Build qTox - run: ./.travis/build-osx.sh + run: ./.ci-scripts/build-osx.sh - name: Upload dmg uses: actions/upload-artifact@v2 with: @@ -509,7 +509,7 @@ jobs: with: fetch-depth: 0 - name: Run - run: ./.travis/build-docs.sh + run: ./.ci-scripts/build-docs.sh build-gitstats: name: Gitstats runs-on: ubuntu-18.04 @@ -520,9 +520,9 @@ jobs: - name: Install gitstats run: sudo apt-get install gitstats - name: Run - run: ./.travis/build-gitstats.sh + run: ./.ci-scripts/build-gitstats.sh - name: Deploy if: github.ref == 'refs/heads/master' env: access_key: ${{ secrets.GITSTATS_DEPLOY_KEY }} - run: ./.travis/deploy-gitstats.sh + run: ./.ci-scripts/deploy-gitstats.sh diff --git a/.github/workflows/commit-format.yaml b/.github/workflows/commit-format.yaml index 4a30eeb9e..9e566e9b7 100644 --- a/.github/workflows/commit-format.yaml +++ b/.github/workflows/commit-format.yaml @@ -11,4 +11,4 @@ jobs: with: fetch-depth: 0 # so that we can see the full commit range - name: Run - run: ./.travis/verify-commit-format.sh + run: ./.ci-scripts/verify-commit-format.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0edcfe720..000000000 --- a/.travis.yml +++ /dev/null @@ -1,300 +0,0 @@ -sudo: required -dist: xenial -language: cpp -cache: ccache - -# regex is for master, release branches, and release tags -branches: - only: - - master - - /^v\d+\.\d+-dev$/ - - /^v(\d+\.){2}\d+$/ - -stages: - - Linux - - name: "Windows Stage 1: Dependencies (OpenSSL, Qt)" - if: type = push OR type = cron - - name: "Windows Stage 2: Dependencies (other)" - if: type = push OR type = cron - - name: "Windows Stage 3: qTox" - if: type = push OR type = cron - -env: - global: - - CIRP_GITHUB_REPO_SLUG="qTox/qTox-nightly-releases" - -jobs: - include: - - stage: Linux - os: linux - env: JOB=verify-commit-format - script: "./.travis/$JOB.sh" - - stage: Linux - os: linux - env: JOB=build-docs DOXYGEN_CONFIG_FILE=doxygen.conf - script: "./.travis/$JOB.sh" - - stage: Linux - os: linux - env: JOB=build-gitstats GITSTATS_DIR=gitstats - addons: - apt: - packages: - - gitstats - script: "./.travis/$JOB.sh" - # the actual compilin' - - stage: Linux - os: linux - env: JOB=build-ubuntu-16-04 - addons: - apt: - packages: - - lcov - script: "./.travis/$JOB.sh" - after_success: - # Create lcov report - - lcov --directory _build --capture --output-file coverage.info - # Filter out system headers and test sources - - lcov --remove coverage.info '/usr/*' '*/test/*' '*/*_autogen/*' --output-file coverage.info - # Upload report to codecov.io - - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports" - - stage: "Windows Stage 1: Dependencies (OpenSSL, Qt)" - os: linux - # Makes the cache this job creates avaiable only to jobs with WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=i686, - # making sure that i686 and x86_64 caches don't overwrite each other - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=i686 - script: ./.travis/build-windows.sh i686 release /opt/build-windows/i686 stage1 - services: - - docker - cache: - directories: - - /opt/build-windows/i686 - - stage: "Windows Stage 1: Dependencies (OpenSSL, Qt)" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=x86_64 - script: ./.travis/build-windows.sh x86_64 release /opt/build-windows/x86_64 stage1 - services: - - docker - cache: - directories: - - /opt/build-windows/x86_64 - - stage: "Windows Stage 2: Dependencies (other)" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=i686 - script: ./.travis/build-windows.sh i686 release /opt/build-windows/i686 stage2 - services: - - docker - cache: - directories: - - /opt/build-windows/i686 - - stage: "Windows Stage 2: Dependencies (other)" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=x86_64 - script: ./.travis/build-windows.sh x86_64 release /opt/build-windows/x86_64 stage2 - services: - - docker - cache: - directories: - - /opt/build-windows/x86_64 - - stage: "Windows Stage 3: qTox" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=i686 - script: - - ./.travis/build-windows.sh i686 release /opt/build-windows/i686 stage3 - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./workspace/i686/qtox/release/{setup-qtox-i686-release.exe,setup-qtox-i686-release.exe.sha256,qtox-i686-release.zip,qtox-i686-release.zip.sha256} "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - cache: - directories: - - /opt/build-windows/i686 - - stage: "Windows Stage 3: qTox" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=x86_64 - script: - - ./.travis/build-windows.sh x86_64 release /opt/build-windows/x86_64 stage3 - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./workspace/x86_64/qtox/release/{setup-qtox-x86_64-release.exe,setup-qtox-x86_64-release.exe.sha256,qtox-x86_64-release.zip,qtox-x86_64-release.zip.sha256} "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - cache: - directories: - - /opt/build-windows/x86_64 - - stage: "Windows Stage 3: qTox" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=i686 - script: - - ./.travis/build-windows.sh i686 debug /opt/build-windows/i686 stage3 - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./workspace/i686/qtox/debug/{qtox-i686-debug.zip,qtox-i686-debug.zip.sha256} "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - cache: - directories: - - /opt/build-windows/i686 - - stage: "Windows Stage 3: qTox" - os: linux - env: WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE=x86_64 - script: - - ./.travis/build-windows.sh x86_64 debug /opt/build-windows/x86_64 stage3 - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./workspace/x86_64/qtox/debug/{qtox-x86_64-debug.zip,qtox-x86_64-debug.zip.sha256} "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - cache: - directories: - - /opt/build-windows/x86_64 - - stage: "macOS, AppImage and Flatpak" - os: osx - osx_image: xcode10.2 # macOS 10.14, oldest supported SDK according to https://developer.apple.com/support/xcode/ - env: JOB=build-osx - cache: - timeout: 300 # seconds - ccache: true - directories: - - $HOME/Library/Caches/Homebrew - addons: - homebrew: - brewfile: ./osx/Brewfile - update: true - before_cache: - - brew cleanup - script: - - "./.travis/$JOB.sh" - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./{qTox.dmg,qTox.dmg.sha256} "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - - stage: "macOS, AppImage and Flatpak" - os: linux - env: JOB=APPIMAGE - script: - - ./appimage/build-appimage.sh - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./output/* "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - - stage: "macOS, AppImage and Flatpak" - os: linux - env: JOB=FLATPAK - script: - - ./flatpak/build-flatpak.sh - - export ARTIFACTS_DIR="$(mktemp -d)" - - cp -a ./output/* "$ARTIFACTS_DIR" - - .travis/cirp/cleanup1.sh - - .travis/cirp/store.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup2.sh - services: - - docker - - stage: "Nightly publishing" - if: type == cron - script: - - export ARTIFACTS_DIR="$(mktemp -d)" - - .travis/cirp/collect.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup4.sh - - .travis/cirp/publish.sh "$ARTIFACTS_DIR" - - .travis/cirp/cleanup5.sh - cache: - directories: - - /opt/cirp - - - -deploy: - # Linux AppImage - - provider: releases - # This is the access token for pushing release builds on Tags - # Owner: sudden6 - # See https://docs.travis-ci.com/user/deployment/releases/#authenticating-with-an-oauth-token - token: - secure: "UAvVIUgfH8VGAzMsKk62yz26oqjNpUxEEyZ7OSjt09VoTMuepZd9wPmLCv0b+jFrk5BwQG9gpDzTD7vZ0Un1g1lGD23K801tvMRue/SO/KmOyeYrqd6o7MEFGb22qmmVoid/hqKLQFOxt/5HYj7fnCzG8EUuA9BvdWmsl4ir8Js=" - file_glob: true - file: ./output/* - on: - condition: $JOB == APPIMAGE - repo: qTox/qTox - tags: true - skip_cleanup: true - draft: true - - # Linux Flatpak - - provider: releases - token: - secure: "UAvVIUgfH8VGAzMsKk62yz26oqjNpUxEEyZ7OSjt09VoTMuepZd9wPmLCv0b+jFrk5BwQG9gpDzTD7vZ0Un1g1lGD23K801tvMRue/SO/KmOyeYrqd6o7MEFGb22qmmVoid/hqKLQFOxt/5HYj7fnCzG8EUuA9BvdWmsl4ir8Js=" - file_glob: true - file: ./output/* - on: - condition: $JOB == FLATPAK - repo: qTox/qTox - tags: true - skip_cleanup: true - draft: true - - # osx binary - - provider: releases - token: - secure: "UAvVIUgfH8VGAzMsKk62yz26oqjNpUxEEyZ7OSjt09VoTMuepZd9wPmLCv0b+jFrk5BwQG9gpDzTD7vZ0Un1g1lGD23K801tvMRue/SO/KmOyeYrqd6o7MEFGb22qmmVoid/hqKLQFOxt/5HYj7fnCzG8EUuA9BvdWmsl4ir8Js=" - file: - - "./qTox.dmg" - - "./qTox.dmg.sha256" - on: - condition: $TRAVIS_OS_NAME == osx - repo: qTox/qTox - tags: true - skip_cleanup: true - draft: true - - # Windows Installer 64Bit - - provider: releases - token: - secure: "UAvVIUgfH8VGAzMsKk62yz26oqjNpUxEEyZ7OSjt09VoTMuepZd9wPmLCv0b+jFrk5BwQG9gpDzTD7vZ0Un1g1lGD23K801tvMRue/SO/KmOyeYrqd6o7MEFGb22qmmVoid/hqKLQFOxt/5HYj7fnCzG8EUuA9BvdWmsl4ir8Js=" - file: - - "./workspace/x86_64/qtox/release/setup-qtox-x86_64-release.exe" - - "./workspace/x86_64/qtox/release/setup-qtox-x86_64-release.exe.sha256" - on: - condition: $WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE == x86_64 && -f /home/travis/build/qTox/qTox/stage3 && -f /home/travis/build/qTox/qTox/release - repo: qTox/qTox - tags: true - skip_cleanup: true - draft: true - - # Windows Installer 32Bit - - provider: releases - token: - secure: "UAvVIUgfH8VGAzMsKk62yz26oqjNpUxEEyZ7OSjt09VoTMuepZd9wPmLCv0b+jFrk5BwQG9gpDzTD7vZ0Un1g1lGD23K801tvMRue/SO/KmOyeYrqd6o7MEFGb22qmmVoid/hqKLQFOxt/5HYj7fnCzG8EUuA9BvdWmsl4ir8Js=" - file: - - "./workspace/i686/qtox/release/setup-qtox-i686-release.exe" - - "./workspace/i686/qtox/release/setup-qtox-i686-release.exe.sha256" - on: - condition: $WINDOWS_BUILD_ARCH_CACHE_TRICK_VARIABLE == i686 && -f /home/travis/build/qTox/qTox/stage3 && -f /home/travis/build/qTox/qTox/release - repo: qTox/qTox - tags: true - skip_cleanup: true - draft: true - -after_success: - - > - test "$TRAVIS_PULL_REQUEST" == "false" - && test "$TRAVIS_BRANCH" == "master" - && test "$JOB" == "build-docs" - && bash ./.travis/deploy-docs.sh - - > - test "$TRAVIS_PULL_REQUEST" == "false" - && test "$TRAVIS_BRANCH" == "master" - && test "$JOB" == "build-gitstats" - && bash ./.travis/deploy-gitstats.sh