diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c19259..a80823d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - package - test - - .repo + - repo - pages .vars: &vars @@ -42,6 +42,7 @@ stages: --maintainer "Stefan Heitmüller " --url "${URL}" --depends git + --deb-recommends morph027-keyring --deb-systemd "${CI_PROJECT_DIR}/.packaging/${NAME}.service" --deb-activate-noawait /etc/init.d --prefix=/ @@ -114,20 +115,12 @@ reprepro: paths: - $CI_PROJECT_DIR/.repo key: reprepro - stage: .repo + stage: repo image: registry.gitlab.com/packaging/reprepro-multiple-versions:latest script: - - echo "$SIGNING_KEY" > /tmp/key - - gpg --import /tmp/key - - rm -f /tmp/key - - test -f $CI_PROJECT_DIR/.repo/gpg.key || gpg --export --armor "$SIGNING_KEY_ID" > $CI_PROJECT_DIR/.repo/gpg.key - - sed -i 's,##SIGNING_KEY_ID##,'$SIGNING_KEY_ID',' .repo/conf/distributions - - find $CI_PROJECT_DIR -type f -name "*.deb" -exec - reprepro - -b $CI_PROJECT_DIR/.repo - includedeb - gitea - {} \+; + - apt-get -qq update + - apt-get -qqy install curl + - curl -L https://gitlab.com/packaging/utils/-/raw/main/repo.sh | bash -s -- gitea only: - tags @@ -143,7 +136,8 @@ pages: script: - mkdir $CI_PROJECT_DIR/public - cp -r - $CI_PROJECT_DIR/.repo/{gpg.key,dists,pool} + $CI_PROJECT_DIR/.repo/gpg.key + $CI_PROJECT_DIR/.repo/gitea/{dists,pool} $CI_PROJECT_DIR/public/ artifacts: paths: diff --git a/.repo/conf/distributions b/.repo/gitea/conf/distributions similarity index 100% rename from .repo/conf/distributions rename to .repo/gitea/conf/distributions diff --git a/README.md b/README.md index 6e9f1c7..c814cf8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ echo "deb https://packaging.gitlab.io/gitea gitea main" | sudo tee /etc/apt/sour ``` sudo apt-get update -sudo apt-get install gitea +sudo apt-get install gitea morph027-keyring ``` ### Start