diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-07-07 11:12:29 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2020-07-09 12:26:52 +0300 |
| commit | 46165e7d384b5086a319ca3cc1dc96ba03e20e1a (patch) | |
| tree | 1d4a2fb20c8459e5de6cd1ee0edbc8487f3e5068 /.github | |
| parent | 3e5d33da7fc4232c58edef8ab4ecc649b7fa9daa (diff) | |
Ci: Craft update to Qt 5.12.9 and a .craft.shelf with pinned versions
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 28 |
1 files changed, 13 insertions, 15 deletions
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 |