Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0e7f456 authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

use CI_PROJECT_ID instead of PROJECT_ID

parent 0e162ea9

scripts/create-json-files.sh

+6 −6
Original line number Diff line number Diff line
@@ -92,14 +92,14 @@ echo "File size for - $OFFICIAL_APK - $apk_size_official" 


# Generate json files ====================



if [[ "$BLOCKED_COMMUNITY" != "true" ]]; then

  generateJsonFile community.json "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$COMMUNITY_APK?job=generate-apks"

  editJson community.json "size" "$apk_size_community"

if [[ "$BLOCKED_DEV" != "true" ]]; then

  generateJsonFile dev.json "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$DEV_APK?job=generate-apks"

  editJson dev.json "size" "$apk_size_dev"

fi



if [[ "$BLOCKED_OFFICIAL" != "true" ]]; then

  generateJsonFile official.json "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$OFFICIAL_APK?job=generate-apks"

  editJson official.json "size" "$apk_size_official"

if [[ "$BLOCKED_STABLE" != "true" ]]; then

  generateJsonFile stable.json "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$STABLE_APK?job=generate-apks"

  editJson stable.json "size" "$apk_size_stable"

fi



# Move json file for artifacts ====================

scripts/create-release.sh

+5 −5
Original line number Diff line number Diff line
@@ -16,24 +16,24 @@ cat > data.json << EOF 
    "links": [

      {

        "name": "community.json",

        "url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/community.json?job=create-json-files",

        "url": "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/community.json?job=create-json-files",

        "direct_asset_path": "/json/community.json",

        "link_type": "other"

      },

      {

        "name": "official.json",

        "url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/official.json?job=create-json-files",

        "url": "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/official.json?job=create-json-files",

        "direct_asset_path": "/json/official.json",

        "link_type": "other"

      },

      {

        "name": "$COMMUNITY_APK",

        "url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$COMMUNITY_APK?job=generate-apks",

        "url": "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$COMMUNITY_APK?job=generate-apks",

        "link_type": "package"

      },

      {

        "name": "$OFFICIAL_APK",

        "url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$OFFICIAL_APK?job=generate-apks",

        "url": "https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$OFFICIAL_APK?job=generate-apks",

        "link_type": "package"

      }

    ]
@@ -46,7 +46,7 @@ compressed_json=$(jq -c . data.json) 
response=$(curl --data "$compressed_json" \

	--header 'Content-Type: application/json' --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \

	--fail --output "/dev/null" --silent --show-error \

	--request POST https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/releases)

	--request POST https://gitlab.e.foundation/api/v4/projects/$CI_PROJECT_ID/releases)



if [ $? -ne 0 ]; then

  echo "Error: Failed to create release"