Merge branch 'develop' into feature/list
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

# Conflicts:
#	.drone.yml
This commit is contained in:
Rick Barenthin 2022-07-26 10:27:45 +02:00
commit 7c22a1db80
4 changed files with 90 additions and 11 deletions

View File

@ -4,35 +4,60 @@ type: docker
name: main
steps:
- name: Tag commit
image: alpine
- name: fetch tags
image: alpine/git
commands:
- echo This would create a tag
- git fetch --tags
- name: update version and changelog
image: registry.riba-interactive.de/conventi:0.1.0
- name: commit changelog updates
image: alpine/git
commands:
- git add .
- git commit -m "[CI SKIP] version and changelog update"
- git push origin $DRONE_TARGET_BRANCH
- name: tag commit
image: registry.riba-interactive.de/conventi:0.1.0
commands:
- export version=$(conventi.sh get_version)
- git tag -am "Tagging new version $version" "$version"
- git push origin "$version"
trigger:
branch:
- main
event:
- push
image_pull_secrets:
- dockerconfig
---
kind: pipeline
type: docker
name: develop
name: tag
steps:
- name: Tag commit
image: alpine
- name: Build release
image: registry.riba-interactive.de/alpine-build:1
commands:
- echo This would build the app and run test
- cmake -S. -Bcmake-build-ci -DCMAKE_BUILD_TYPE=Release
- cd cmake-build-ci
- cmake --build .
- echo "Done"
trigger:
branch:
- develop
event:
- tag
image_pull_secrets:
- dockerconfig
---
kind: pipeline
type: docker
name: feature
name: Build and Test
steps:
- name: Run tests
- name: Build and run tests
image: registry.riba-interactive.de/alpine-build:1
commands:
- cmake -S. -Bcmake-build-ci -DCMAKE_BUILD_TYPE=Debug -DENABLE_TEST_COVERAGE=on
@ -40,8 +65,17 @@ steps:
- cmake --build .
- ctest -T Test -T Coverage
- name: Report test and coverage
image: alpine
commands:
- echo "Do some curl or so"
when:
event:
- pull_request
trigger:
branch:
- develop
- feature/*
image_pull_secrets:

5
.version.json Normal file
View File

@ -0,0 +1,5 @@
{
"version": "0.1.1",
"sha": "dc2e644",
"url": "https://git.riba-interactive.de/rick/waitui"
}

33
CHANGELOG.md Normal file
View File

@ -0,0 +1,33 @@
# Changelog
All notable changes to this project will be documented in this file. See [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for commit guidelines.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
----
## [0.1.1](https://git.riba-interactive.de/rick/waitui/compare/3fe3a2a...dc2e644) (2022-06-01)
### Bug fixes 🩹
* **conventi:** fix `conventi.sh` function `get_commit_body()` ([dc2e644](https://git.riba-interactive.de/rick/waitui/commit/dc2e644))
## [0.1.0](https://git.riba-interactive.de/rick/waitui/compare/dafd1ae...3fe3a2a) (2022-06-01)
### Bug fixes 🩹
* **pipeline:** fix `git push` parameters ([3fe3a2a](https://git.riba-interactive.de/rick/waitui/commit/3fe3a2a))
* **pipeline:** push version and changelog after update ([e992129](https://git.riba-interactive.de/rick/waitui/commit/e992129))
* **pipeline:** fix image pull in pipeline ([cda7b95](https://git.riba-interactive.de/rick/waitui/commit/cda7b95))
### Features 📦
* add version and changelog update to pipeline ([7dd39a9](https://git.riba-interactive.de/rick/waitui/commit/7dd39a9))
### Chores 🧽
* **release:** release the lastest develop ([cae8167](https://git.riba-interactive.de/rick/waitui/commit/cae8167))

7
build/Dockerfile.build Normal file
View File

@ -0,0 +1,7 @@
FROM alpine:3.16.0
RUN apk --no-cache add \
bison \
build-base \
cmake \
flex