Merge branch 'main' into 'feature/publishfdroid'

# Conflicts:
#   .gitlab-ci.yml
This commit is contained in:
Kai Kriegel 2023-01-25 19:55:46 +00:00
commit 4f8d1aa68b

View File

@ -210,7 +210,6 @@ pages:
stage: deploy
needs:
- pack_FDroid_APK
- pack_iOS
rules:
- if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/
tags:
@ -238,6 +237,41 @@ pages:
paths:
- public
upload_binaries:
stage: deploy
needs:
- pack_Android_APK
tags:
- docker
image: curlimages/curl:latest
before_script: []
cache: []
script:
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/borepin/${CI_COMMIT_TAG}/org.fab_infra.fabaccess-Signed.apk"'
rules:
- if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/
release_job:
stage: deploy
needs:
- upload_binaries
image: registry.gitlab.com/gitlab-org/release-cli:latest
tags:
- docker
rules:
- if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/
when: manual
script:
- echo "Creating GitLab release…"
release:
name: "Borepin ${CI_COMMIT_TAG}"
description: "GitLab CI auto-created release"
tag_name: "release/${CI_COMMIT_TAG}"
assets:
links:
- name: 'Borepin signed apk'
url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/borepin/${CI_COMMIT_TAG}/org.fab_infra.fabaccess-Signed.apk"
deploy_Android_Beta:
stage: deploy
needs: