Skip to content
Permalink
Browse files

improved Qt6 workflow

  • Loading branch information
3nids committed Mar 24, 2021
1 parent 3b56d2d commit 80489d601cb13fa71524d5714531bd018e53e424
Showing with 19 additions and 5 deletions.
  1. +19 −5 .github/workflows/qt6.disabled
@@ -11,6 +11,7 @@ on:
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'
- '.docker/**'
pull_request:
branches:
- master
@@ -21,6 +22,8 @@ on:
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'
- '.docker/**'
workflow_dispatch:

jobs:
build:
@@ -29,10 +32,21 @@ jobs:
- name: Checkout
uses: actions/checkout@master

- name: Setup build dependencies
run: |
docker build -t qgis_build_deps -f .docker/qgis3-qt6-build-deps.dockerfile .
- name: Build Docker Container with Build Environment
id: docker-build
uses: whoan/docker-build-with-cache-action@v5
with:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com
image_name: qgis3-qt6-build-deps
dockerfile: .docker/qgis3-qt6-build-deps.dockerfile
push_git_tag: true
push_image_and_stages: on:push
pull_image_and_stages: ${{ github.event_name != 'workflow_dispatch' }}

- name: Run build
run: |
docker run -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.docker/docker-qgis-build-qt6.sh

docker run -v $(pwd):/usr/src/qgis ${DOCKER_IMAGE} /usr/src/qgis/.docker/docker-qgis-build-qt6.sh
env:
DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }}

0 comments on commit 80489d6

Please sign in to comment.