diff options
| -rw-r--r-- | .craft.ini (renamed from .appveyor.ini) | 11 | ||||
| -rw-r--r-- | .craft.shelf | 158 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 28 |
3 files changed, 178 insertions, 19 deletions
diff --git a/.appveyor.ini b/.craft.ini index c11285464..3e143fd3c 100644 --- a/.appveyor.ini +++ b/.craft.ini @@ -11,11 +11,14 @@ CreateCache = True ownCloudVersion = 2.7 # this version must match the target in the blueprint + # update MacDeploymentTarget when updating Qt -QtVersion = 5.12.7 +QtVersion = 5.12.9 CachePatchLvl = 1 -# set APPVEYOR_BUILD_FOLDER to cwd, override on ci +# set WORKSPACE to cwd, override on ci +# with legacy fallbac APPVEYOR_BUILD_FOLDER +WORKSPACE = ${Variables:APPVEYOR_BUILD_FOLDER} APPVEYOR_BUILD_FOLDER = ${Variables:Root} CiBuild = True @@ -29,13 +32,13 @@ Version/ConfigVersion = 6 #https://github.com/qt/qtbase/blob/5.12/mkspecs/common/macx.conf#L8 General/MacDeploymentTarget = 10.12 -Packager/Destination=${Variables:APPVEYOR_BUILD_FOLDER}/binaries +Packager/Destination=${Variables:WORKSPACE}/binaries Paths/Python = C:/Python36 Paths/Python27 = C:/Python27 Paths/DownloadDir = ${Variables:Root}/downloads Blueprints/BlueprintRoot = ${Variables:Root}/blueprints ShortPath/JunctionDir = /_/ -Packager/CacheDir = ${Variables:APPVEYOR_BUILD_FOLDER}/cache +Packager/CacheDir = ${Variables:WORKSPACE}/cache Packager/UseCache = ${Variables:UseCache} Packager/CreateCache = ${Variables:CreateCache} Packager/CacheVersion = ${Variables:ownCloudVersion}/Qt_${Variables:QtVersion}_${Variables:CachePatchLvl} diff --git a/.craft.shelf b/.craft.shelf new file mode 100644 index 000000000..a53690676 --- /dev/null +++ b/.craft.shelf @@ -0,0 +1,158 @@ +[General] +version = 2 +blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|master| + +[core/cacert] +version = 2020-01-01 + +[dev-utils/autoconf] +version = 2.69 + +[dev-utils/automake] +version = 1.16.1 + +[dev-utils/bison] +version = 3.3.2 + +[dev-utils/breakpad-tools] +version = cmake + +[dev-utils/ccache] +version = 3.7.8 + +[dev-utils/cmake] +version = latest + +[dev-utils/cmake-base] +version = 3.17.3 + +[dev-utils/cmocka] +version = 1.1.5 + +[dev-utils/create-dmg] +version = master + +[dev-utils/git] +version = 2.26.2 +revision = installation: C:\Program Files\Git\cmd\git.exe + +[dev-utils/help2man] +version = 1.47.6 + +[dev-utils/icoutils] +version = 0.32.3 + +[dev-utils/jom] +version = 1_1_3 + +[dev-utils/kshimgen] +version = 0.4.0 + +[dev-utils/libtool] +version = 2.4.6 + +[dev-utils/m4] +version = 1.4.18 + +[dev-utils/nasm] +version = 2.14.02 + +[dev-utils/ninja] +version = 1.10.0 + +[dev-utils/packagesdev] +version = 1.2.7 + +[dev-utils/patch] +version = 2.5.9 + +[dev-utils/perl] +version = 5.28.1 + +[dev-utils/python2] +version = 2 + +[dev-utils/python3] +version = 3 + +[dev-utils/qtbinpatcher] +version = 2.2.0 + +[dev-utils/wget] +version = 1.18 + +[kde/frameworks/extra-cmake-modules] +version = 5.71.0 + +[libs/d3dcompiler] +version = master + +[libs/gettext] +version = 0.19.8.1 + +[libs/iconv] +version = 0.0.8 + +[libs/liblzma] +version = 5.2.3 + +[libs/libpng] +version = 1.6.37 + +[libs/libxml2] +version = 2.9.7 + +[libs/openssl] +version = 1.1.1g + +[libs/qt5/qtbase] +version = 5.12.9 + +[libs/qt5/qtdeclarative] +version = 5.12.9 + +[libs/qt5/qtmacextras] +version = 5.12.9 + +[libs/qt5/qtsvg] +version = 5.12.9 + +[libs/qt5/qttools] +version = 5.12.9 + +[libs/qt5/qttranslations] +version = 5.12.9 + +[libs/qt5/qtxmlpatterns] +version = 5.12.9 + +[libs/runtime] +version = 15 + +[libs/sqlite] +version = 3.31.1 + +[libs/zlib] +version = 1.2.11 + +[python-modules/pip] +version = 3.4 + +[python-modules/pip-system] +version = 3.4 + +[python-modules/virtualenv] +version = master + +[qt-libs/qtkeychain] +version = 0.10.0 + +[virtual/base] +version = 0.2 + +[virtual/bin-base] +version = 0.2 + +[virtual/craft-blueprints-kde-base] +version = 0.1 + diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d35ada9e..5aa4bc9b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,31 +24,24 @@ jobs: matrix: target: ["windows-msvc2017_32-cl", "windows-msvc2017_64-cl"] env: - APPVEYOR_BUILD_FOLDER: ${{ github.workspace }} + WORKSPACE: ${{ github.workspace }} CRAFT: C:/CraftMaster/${{ matrix.target }}/craft/bin/craft.py steps: - name: Check out source code uses: actions/checkout@v2 with: - fetch-depth: 50 # so git-describe works + fetch-depth: 1 submodules: true - - name: Fetch tag information - if: startsWith(github.ref, 'refs/tags/') - run: git fetch -f origin $GITHUB_REF:$GITHUB_REF - - name: Clone CraftMaster run: git clone --depth=1 https://invent.kde.org/kde/craftmaster.git C:/CraftMaster/CraftMaster - name: Configure CraftMaster - run: py C:/CraftMaster/CraftMaster/CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER/.appveyor.ini --variables "APPVEYOR_BUILD_FOLDER=$env:APPVEYOR_BUILD_FOLDER" - - - name: Init Craft - run: py $env:CRAFT craft + run: py C:/CraftMaster/CraftMaster/CraftMaster.py --config $env:WORKSPACE/.craft.ini --variables "WORKSPACE=$env:WORKSPACE" - - name: Add ownCloud blueprint - run: py $env:CRAFT --add-blueprint-repository https://github.com/owncloud/craft-blueprints-owncloud.git + - name: Craft unshelve + run: py $env:CRAFT --unshelve $env:WORKSPACE/.craft.shelf - name: Install NSIS run: py $env:CRAFT dev-utils/nsis @@ -57,13 +50,18 @@ jobs: run: py $env:CRAFT --install-deps owncloud/owncloud-client - name: Build - run: py $env:CRAFT --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER owncloud/owncloud-client + run: py $env:CRAFT --no-cache --src-dir $env:WORKSPACE owncloud/owncloud-client - name: Run tests - run: py $env:CRAFT --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER --test owncloud/owncloud-client + run: py $env:CRAFT --no-cache --src-dir $env:WORKSPACE --test owncloud/owncloud-client - name: Package - run: py $env:CRAFT --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER --package owncloud/owncloud-client + run: py $env:CRAFT --no-cache --src-dir $env:WORKSPACE --package owncloud/owncloud-client + + - name: Update shelf + run: | + py $env:CRAFT --shelve $env:WORKSPACE/.craft.shelf + Copy-Item $env:WORKSPACE/.craft.shelf $env:WORKSPACE/binaries/ - name: Upload artifacts uses: actions/upload-artifact@v2 |