From 5425eec545b2cd59bd39029c0d1ae0ba50bea898 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 16 Jan 2023 10:23:58 +0100 Subject: [PATCH] .gitlab-ci.yml simplified --- .gitlab-ci.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8274c25..89db932 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: python:3.10-slim-bullseye + image: python:3.11-slim-bullseye stage: test rules: - if: $CI_COMMIT_BRANCH @@ -113,6 +113,9 @@ test: - cd test script: - pytest main.py + artifacts: + reports: + dotenv: version.env .test:linux: stage: test @@ -271,24 +274,11 @@ deploy:pacman: - 'echo "EXPORT_NAME: ${EXPORT_NAME}"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${EXPORT_NAME} "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${PACKAGE_VERSION}/${EXPORT_NAME}"' -release:prepare: - stage: .pre - rules: - - if: $CI_COMMIT_TAG - when: never - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - script: - - source version.env - - echo $VERSION - artifacts: - reports: - dotenv: version.env - release: image: registry.gitlab.com/gitlab-org/release-cli:latest stage: .post needs: - - job: release:prepare + - job: test artifacts: true rules: - if: $CI_COMMIT_TAG