Skip to content

Commit

Permalink
[CI] Restore build job
Browse files Browse the repository at this point in the history
  • Loading branch information
dmarteau committed Sep 27, 2024
1 parent 60beb2b commit 1393f82
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
24 changes: 24 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ variables:

stages:
- test
- build
- docker
- deploy
- release
Expand Down Expand Up @@ -33,6 +34,29 @@ tests:
matrix:
- QGIS_FLAVOR: ['ltr', 'release', '3.28']

#---------------
# Build
#---------------

build:
image: ${REGISTRY_URL}/factory-ci-runner:python
stage: build
script:
- source ~/.bashrc
- make dist deliver
environment:
name: snap
tags:
- infrav3-plain
only:
refs:
- tags
- master
except:
- schedules
- triggers


# Docker build
include: '/docker/.gitlab-ci.yml'

Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ DEPTH=.

include $(DEPTH)/config.mk

BUILDDIR:=build
DIST:=${BUILDDIR}/dist
DIST:=dist

MANIFEST=pyqgisserver/build.manifest

PYTHON_PKG=pyqgisserver pyqgisservercontrib

TESTDIR=tests/unittests

PYPISERVER:=storage

# This is necessary with pytest as long it is not fixed
# see also https://github.com/qgis/QGIS/pull/5337
export QGIS_DISABLE_MESSAGE_HOOKS := 1
Expand All @@ -33,14 +34,14 @@ manifest: version
echo commitid=$(COMMITID) >> $(MANIFEST)

deliver:
twine upload -r storage $(DIST)/*
twine upload $(TWINE_OPTIONS) -r $(PYPISERVER) $(DIST)/*

dist: dirs configure
rm -rf *.egg-info
$(PYTHON) setup.py sdist --dist-dir=$(DIST)

clean:
rm -rf $(BUILDDIR)
rm -rf $(DIST)

test: lint
make -C tests test PYTEST_ADDOPTS=$(PYTEST_ADDOPTS)
Expand Down

0 comments on commit 1393f82

Please sign in to comment.