Remove old CI code

This commit is contained in:
Yuriy Puchkov
2020-09-28 15:45:53 +03:00
parent fc86f473cd
commit 05cbd9660f
4 changed files with 6 additions and 234 deletions

View File

@@ -1,105 +0,0 @@
dist: xenial
sudo: required
language: cpp
addons:
artifacts: true
branches:
only:
- master
- master_nc
cache:
directories:
- $HOME/.cache
env:
global:
# Environment variables for packaging
- PRODUCT=flameshot
# TODO: we should take version from the last tag in git history + build number
- VERSION=0.7.12
- RELEASE=1
- ARCH=x86_64
# Dockerfile from https://github.com/flameshotapp/flameshot-docker-images
- DOCKER_REPO=vitzy/flameshot
# Option: wetransfer.com, file.io, 0x0.st, transfer.sh
- UPLOAD_SERVICE=wetransfer.com
# The actual list of distribution is available on
# https://hub.docker.com/r/vitzy/flameshot/tags/
matrix:
include:
- os: linux
# 1 - Fedora 31
env: OS=fedora DIST=31 EXTEN=rpm
services: docker
- os: linux
# 2 - Fedora 32
env: OS=fedora DIST=32 EXTEN=rpm
services: docker
- os: linux
# 3 - Ubuntu 16.04 LTS
env: OS=ubuntu DIST=xenial EXTEN=deb
services: docker
- os: linux
# 4 - Ubuntu 18.04 LTS
env: OS=ubuntu DIST=bionic EXTEN=deb
services: docker
- os: linux
# 5 - Ubuntu 20.04 LTS
env: OS=ubuntu DIST=focal EXTEN=deb
services: docker
- os: linux
# 6 - Debian stretch
env: OS=debian DIST=stretch EXTEN=deb
services: docker
- os: linux
# 7 - Debian 9 (stretch)
env: OS=debian DIST=stretch EXTEN=deb
services: docker
- os: linux
# 8 - Debian 10 (buster)
env: OS=debian DIST=buster EXTEN=deb
services: docker
- os: linux
# 8
# No docker environment, just for CI build & test
# ubuntu xenial; default Qt version is 5.6.1
env: OS=ubuntu DIST=xenial EXTEN=other
# - os: osx
# # 9 - MacOS
# compiler: clang
# osx_image: xcode9.2
before_install:
- export ROOT_PATH="$(pwd)"
- chmod +x .travis/*.sh
- chmod +x .travis/services/*.sh
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_before_install.sh; fi
install:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_install.sh; fi
script:
# - git submodule update --init --recursive
# - git describe --long
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_script.sh; fi
# - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then source .travis/osx_script.sh; fi
#after_success:
# - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_after_success.sh; fi
# - echo "Download URL is ${TEMP_DOWNLOAD_URL} "
# deploy:
# # Deploy packages to Github Release
# provider: releases
# api_key: "GITHUB ENCYPTED OAUTH TOKEN"
# file_glob: true
# file: dist/*.{deb,rpm,AppImage,dmg}
# skip_cleanup: true
# on:
# tags: true
# branch: master

View File

@@ -6,15 +6,14 @@ environment:
Qt5_INSTALL_DIR: 'C:\Qt\5.15.0\msvc2019_64'
PATH: '%Qt5_INSTALL_DIR%\bin;%PATH%'
build_script:
- cmd: >-
- cmd: >-
mkdir build
mkdir build
cd build
cd build
echo %PATH%
echo %PATH%
cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build . --config "Release"
cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build . --config "Release"

View File

@@ -1,56 +0,0 @@
#!/bin/bash
set -x
GIT_REMOTE=origin
BASE_VERSION_NEW="0.7.12"
BASE_VERSION_CUR=$(cat flameshot.pro |grep "[0-9]\+\.[0-9]\+\.[0-9]\+" |awk "{print \$3}")
if [ "${BASE_VERSION_CUR}" == "${BASE_VERSION_NEW}" ]; then
echo "Current and new versions are the same, no action required"
exit 1
fi
TAG_EXISTS=$(git ls-remote --tags ${GIT_REMOTE} |grep "refs/tags/v${BASE_VERSION_NEW}")
if [ "" != "${TAG_EXISTS}" ]; then
echo "Tag already exists: ${TAG_EXISTS}"
echo "Please update to another version or remove git tag"
exit 1
fi
# stop on any error
set -e
# create release branch
git checkout -b release/${BASE_VERSION_NEW}
# update version to a new one
sed -i "s/BASE_VERSION = ${BASE_VERSION_CUR}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro
sed -i "s/version: ${BASE_VERSION_CUR}/version: ${BASE_VERSION_NEW}/g" appveyor.yml
sed -i "s/VERSION=${BASE_VERSION_CUR}/VERSION=${BASE_VERSION_NEW}/g" .travis.yml
sed -i "s/VersionInfoVersion=${BASE_VERSION_CUR}/VersionInfoVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss
BASE_VERSION_NEW_EXT="${BASE_VERSION_NEW}-$(git rev-parse --short=7 HEAD)"
BASE_VERSION_CUR_EXT=$(cat ./win_setup/flameshot.iss |grep "AppVersion=[0-9]\+\.[0-9]\+\.[0-9]\+-*[0-9a-f]*" |cut -d "=" -f2)
echo "BASE_VERSION_CUR_EXT: ${BASE_VERSION_CUR_EXT}"
sed -i "s/AppVersion=${BASE_VERSION_CUR_EXT}/AppVersion=${BASE_VERSION_NEW_EXT}/g" ./win_setup/flameshot.iss
# Run qmake and generate Makefile
qmake
# update qt translations, ignore if no `lupdate` utils is installed
lupdate -recursive ./ -ts ./translations/* || true
lrelease flameshot.pro
# push current release
git add flameshot.pro ./win_setup/flameshot.iss appveyor.yml .travis.yml update_release_version.sh translations/
git commit -m "Update version to ${BASE_VERSION_NEW}"
#git push ${GIT_REMOTE} -u release/${BASE_VERSION_NEW}
# add new release tag
git tag "v${BASE_VERSION_NEW}"
git push ${GIT_REMOTE} -u release/${BASE_VERSION_NEW} --tags
#git push ${GIT_REMOTE} --tags
echo "New Flameshot version is: ${BASE_VERSION_NEW}"

View File

@@ -1,66 +0,0 @@
; -- Example3.iss --
; Same as Example1.iss, but creates some registry entries too and allows the end
; use to choose the install mode (administrative or non administrative).
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
[Setup]
AppName=Flameshot
AppVersion=0.7.12-2c3237a
AppCopyright=NameCheap inc.
VersionInfoVersion=0.7.12
WizardStyle=modern
DefaultDirName={autopf}\Flameshot
DefaultGroupName=Flameshot
UninstallDisplayIcon={app}\flameshot.exe
Compression=lzma2
SolidCompression=yes
;OutputDir=userdocs:Inno Setup Examples Output
OutputBaseFilename=Flameshot-Setup
ChangesAssociations=yes
UserInfoPage=yes
PrivilegesRequiredOverridesAllowed=dialog
AppPublisher=Namecheap, Inc.
AppPublisherURL=https://www.namecheap.com/
; "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin\signtool.exe" sign /f "C:\MY_CODE_SIGNING.PFX" /t http://timestamp.comodoca.com/authenticode /p MY_PASSWORD $f
[Files]
Source: "flameshot\*"; DestDir: "{app}"
Source: "flameshot\bearer\*"; DestDir: "{app}\bearer"
Source: "flameshot\iconengines\*"; DestDir: "{app}\iconengines"
Source: "flameshot\imageformats\*"; DestDir: "{app}\imageformats"
Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
Source: "flameshot\translations\*"; DestDir: "{app}\translations"
Source: "flameshot\vcredist-2013.exe"; DestDir: {app}
Source: "flameshot\vcredist.exe"; DestDir: {app}
[Icons]
Name: "{commondesktop}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
Name: "{group}\Flameshot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
Name: "{group}\FlameShot Documentation"; Filename: "https://collab.namecheap.net/display/~anastasiamelnik/Flameshot%3A+Screenshot+tool"; WorkingDir: "{app}"
;Name: "{group}\FlameShot Documentation"; Filename: "{app}\flameshot-documentation.pdf"; WorkingDir: "{app}"
; NOTE: Most apps do not need registry entries to be pre-created. If you
; don't know what the registry is or if you need to use it, then chances are
; you don't need a [Registry] section.
[Run]
Filename: {app}\vcredist-2013.exe; \
Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
StatusMsg: "Installing VC++ 2013 Redistributables..."
Filename: {app}\vcredist.exe; \
Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
StatusMsg: "Installing VC++ 2015 Redistributables..."
[UninstallRun]
Filename: "taskkill"; Parameters: "/im ""flameshot.exe"" /f"; Flags: runhidden
[Code]
function ShouldSkipPage(PageID: Integer): Boolean;
begin
// User specific pages should be skipped in administrative install mode
Result := IsAdminInstallMode and (PageID = wpUserInfo);
end;