refactor: rename dev -> community, stable -> official (#2485) (99cda588) · Commits · e / os / System apps update info

scripts/create-json-files.sh

+15 −15

Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@

		APK_PATH="$1"
		SOURCE_APK="$2"
		DEV_APK="$3"
		STABLE_APK="$4"
		COMMUNITY_APK="$3"
		OFFICIAL_APK="$4"

		# Functions ====================

		@@ -53,7 +53,7 @@ editJson() {
		mv "$tmp" "$file"
		}

		# Generate update info about dev or stable builds.
		# Generate update info about community or official builds.
		# Args: file_name apk_download_url
		generateJsonFile() {
		local fileName="$1"
		@@ -80,31 +80,31 @@ version_name="$(getApkInfo "package:" "versionName=")"
		version_code="$(getApkInfo "package:" "versionCode=")"
		min_sdk="$(getApkInfo "sdkVersion:" "sdkVersion:")"
		application_label="$(getApkInfo "application:" "label=")"
		apk_size_dev="$(getFileSizeInBytes $DEV_APK)"
		apk_size_stable="$(getFileSizeInBytes $STABLE_APK)"
		apk_size_community="$(getFileSizeInBytes $COMMUNITY_APK)"
		apk_size_official="$(getFileSizeInBytes $OFFICIAL_APK)"
		echo "Package name - $package_name"
		echo "Version name - $version_name"
		echo "Version code - $version_code"
		echo "Minimum SDK - $min_sdk"
		echo "Application label - $application_label"
		echo "File size for - $DEV_APK - $apk_size_dev"
		echo "File size for - $STABLE_APK - $apk_size_stable"
		echo "File size for - $COMMUNITY_APK - $apk_size_community"
		echo "File size for - $OFFICIAL_APK - $apk_size_official"

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

		if [[ "$BLOCKED_DEV" != "true" ]]; then
		generateJsonFile dev.json "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$DEV_APK?job=generate-apks"
		editJson dev.json "size" "$apk_size_dev"
		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"
		fi

		if [[ "$BLOCKED_STABLE" != "true" ]]; then
		generateJsonFile stable.json "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$STABLE_APK?job=generate-apks"
		editJson stable.json "size" "$apk_size_stable"
		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"
		fi

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

		popd
		mv $APK_PATH/dev.json .
		mv $APK_PATH/stable.json .
		mv $APK_PATH/community.json .
		mv $APK_PATH/official.json .

scripts/create-release.sh

+12 −12

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@

		APK_PATH="$1"
		UNSIGNED_APK="$2"
		DEV_APK="$3"
		STABLE_APK="$4"
		COMMUNITY_APK="$3"
		OFFICIAL_APK="$4"

		cat > data.json << EOF
		{
		@@ -15,25 +15,25 @@ cat > data.json << EOF
		"assets": {
		"links": [
		{
		"name": "dev.json",
		"url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/dev.json?job=create-json-files",
		"direct_asset_path": "/json/dev.json",
		"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",
		"direct_asset_path": "/json/community.json",
		"link_type": "other"
		},
		{
		"name": "stable.json",
		"url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/stable.json?job=create-json-files",
		"direct_asset_path": "/json/stable.json",
		"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",
		"direct_asset_path": "/json/official.json",
		"link_type": "other"
		},
		{
		"name": "$DEV_APK",
		"url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$DEV_APK?job=generate-apks",
		"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",
		"link_type": "package"
		},
		{
		"name": "$STABLE_APK",
		"url": "https://gitlab.e.foundation/api/v4/projects/$PROJECT_ID/jobs/artifacts/${CI_COMMIT_TAG}/raw/$APK_PATH/$STABLE_APK?job=generate-apks",
		"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",
		"link_type": "package"
		}
		]

scripts/generate-apks.sh

+14 −14

Original line number	Diff line number	Diff line
		@@ -6,39 +6,39 @@
		# Also needs the following CI variable set:
		# KEYSTORE
		# KEYSTORE_PASSWORD
		# KEYSTORE_ALIAS_DEV
		# KEYSTORE_ALIAS_STABLE
		# KEYSTORE_ALIAS_COMMUNITY
		# KEYSTORE_ALIAS_OFFICIAL

		APK_PATH="$1"
		UNSIGNED_APK="$2"
		DEV_APK="$3"
		STABLE_APK="$4"
		COMMUNITY_APK="$3"
		OFFICIAL_APK="$4"

		cd $APK_PATH
		cp $UNSIGNED_APK $DEV_APK
		cp $UNSIGNED_APK $STABLE_APK
		cp $UNSIGNED_APK $COMMUNITY_APK
		cp $UNSIGNED_APK $OFFICIAL_APK

		echo "${KEYSTORE}" \| base64 -d > ~/proprietary.keystore.jks

		java -jar /usr/bin/apksigner sign \
		--ks ~/proprietary.keystore.jks \
		--ks-key-alias $KEYSTORE_ALIAS_DEV \
		--ks-pass env:KEYSTORE_PASSWORD $DEV_APK
		--ks-key-alias $KEYSTORE_ALIAS_COMMUNITY \
		--ks-pass env:KEYSTORE_PASSWORD $COMMUNITY_APK

		if [ $? -ne 0 ]; then
		echo "Error: Failed to sign DEV APK"
		echo "Error: Failed to sign COMMUNITY APK"
		exit 1
		fi
		echo "Signed DEV"
		echo "Signed COMMUNITY"

		java -jar /usr/bin/apksigner sign \
		--ks ~/proprietary.keystore.jks \
		--ks-key-alias $KEYSTORE_ALIAS_STABLE \
		--ks-pass env:KEYSTORE_PASSWORD $STABLE_APK
		--ks-key-alias $KEYSTORE_ALIAS_OFFICIAL \
		--ks-pass env:KEYSTORE_PASSWORD $OFFICIAL_APK

		if [ $? -ne 0 ]; then
		echo "Error: Failed to sign STABLE APK"
		echo "Error: Failed to sign OFFICIAL APK"
		exit 1
		fi
		echo "Signed STABLE"
		echo "Signed OFFICIAL"