diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-09-04 14:10:02 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-04 15:50:57 +0000 |
commit | 15a0dfea97021bc6769cf2866a021b778b99307f (patch) | |
tree | 6ecbf1078f6fce3ffba8f6e475ac2b956e51fb4d /.github | |
parent | 3dcfba17b4ef39b742691539053f72e6deac28a9 (diff) | |
download | qbs-15a0dfea97021bc6769cf2866a021b778b99307f.tar.gz |
GitHub actions: reorder steps
...to make it more consistent between platforms
Change-Id: Ifbc86f30a61699216ad93e43ddf5699e6aa63907
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/main.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aed5bb11f..730966c66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,8 +143,6 @@ jobs: toolchain: clang_64 - name: Install Qt Creator uses: ./.github/actions/download-qtc - - name: Print ccache stats - run: ccache -s - name: Setup Qbs run: | qbs setup-toolchains --detect @@ -152,6 +150,8 @@ jobs: qbs config profiles.qt.baseProfile xcode-macosx-x86_64 qbs config defaultProfile qt qbs config --list + - name: Print ccache stats + run: ccache -s - name: Build Qbs run: scripts/build-qbs-with-qbs.sh - name: Print ccache stats @@ -176,15 +176,6 @@ jobs: WITH_TESTS: 0 steps: - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install beautifulsoup4 lxml - pip install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b - name: prepare timestamp id: ccache_cache_timestamp run: | @@ -197,8 +188,15 @@ jobs: path: ~/clcache key: ${{ runner.os }}-clcache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: ${{ runner.os }}-clcache- - - name: Print clcache stats - run: clcache -s + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install required packages + run: | + python -m pip install --upgrade pip + pip install beautifulsoup4 lxml + pip install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b - name: Install Qt uses: ./.github/actions/download-qt with: @@ -212,6 +210,8 @@ jobs: qbs config defaultProfile qt qbs config --list shell: bash + - name: Print clcache stats + run: clcache -s - name: Build Qbs run: scripts/build-qbs-with-qbs.sh shell: bash |