From 1d1b0c11a973bbe211d5d3a395c50ea4e4cbc37f Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 18 Dec 2020 14:41:48 +0100 Subject: [PATCH] fix CI --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cc2613..a2bfb6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ assembleDebug: cache: key: "${CI_COMMIT_TAG}" paths: - - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk + - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk - app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk policy: push script: @@ -76,11 +76,11 @@ assembleDebug: # Basic android and gradle stuff # Check linting -lintFdroid_acadDebug: +lintfdroid_peertube_apps_educDebug: interruptible: true stage: build script: - - ./gradlew -Pci --console=plain :app:lintFdroid_acadDebug -PbuildDir=lint + - ./gradlew -Pci --console=plain :app:lintfdroid_peertube_apps_educDebug -PbuildDir=lint except: - tags @@ -110,7 +110,7 @@ putApkOnTags: cache: key: "${CI_COMMIT_TAG}" paths: - - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk + - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk - app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk policy: pull script: @@ -120,11 +120,11 @@ putApkOnTags: - export NC_UPLOAD_URL="${NC_REMOTE_DIR}/${CI_COMMIT_TAG}" - export NC_DOWNLOAD_URL="${NC_SHARE_URL}/download?path=%2F${CI_COMMIT_TAG}%2F&files=" - 'export HEADER="Private-Token: ${GITLAB_API_TOKEN}"' - - export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_acad-debug.apk" + - export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_peertube_apps_educ-debug.apk" - export fullUrl="${NC_DOWNLOAD_URL}app-fdroid_full-debug.apk" - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -X MKCOL "${NC_UPLOAD_URL}"' - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk "${NC_UPLOAD_URL}/app-fdroid_full-debug.apk"' - - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk "${NC_UPLOAD_URL}/app-fdroid_acad-debug.apk"' + - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk "${NC_UPLOAD_URL}/app-fdroid_peertube_apps_educ-debug.apk"' - export description=$(curl -s --header "${HEADER}" "${DESCRIPTION_URL}" | jq .release.description | sed -e 's@"@@g') - if [[ $description == 'null' ]]; then export METHOD="POST"; echo -e "[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi - if [[ $description != 'null' ]]; then export METHOD="PUT"; echo -e "${description}\n\n[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi