Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup nimbus-fml to download from archive.mozilla.org #5898

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Fixup nimbus-fml to download from archive.mozilla.org #5898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions components/nimbus/ios/scripts/nimbus-fml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ find_as_version() {
# We try to resolve that, and find the version from the Package.swift file in that local directory.
# https://github.com/mozilla-mobile/firefox-ios/issues/12243
rust_components_path=$(grep -A 3 $'XCRemoteSwiftPackageReference "rust-components-swift"' "$SOURCE_ROOT/$PROJECT.xcodeproj/project.pbxproj" | grep 'repositoryURL = "file://' | grep -o -E '/\w[^"]+')
number_string=$(grep 'let version =' "$rust_components_path/Package.swift" | grep -E -o "\d+\.0.\d+")
number_string=$(grep 'let version =' "$rust_components_path/Package.swift" | grep -E -o "\d+\.\d+\.\d+")
fi

if [ -z "$number_string" ]; then
Expand All @@ -110,7 +110,26 @@ find_as_version() {
exit 2
fi

AS_VERSION=${number_string//\.0\./\.} # rust-component-swift tags have a middle `.0.` to force it to align with spm. We remove it
## We try and differentiate between two version types.
## Nightlies: 121.0.20231027173509 --> 121.20231027173509
## Releases: 120.0.0 --> 120.0
## 120.0.1 --> 120.0.1
## 120.1.0 --> 120.1.0
# Get the last component, i.e. the patch number…
local patch=${number_string##*.}
# … and check if it's more that 2 digits in length
if [[ ${#patch} -gt 2 ]] ; then
# If so, then it's likely a date stamp, so a nightly.
# We have a middle 0 which we need to get rid of,
# because taskcluster's versions are MAJOR.DATETIME
AS_VERSION=${number_string//\.0\./\.}
else
# Otherwise, it's a release!
# These versions have rules about zero
# minor number and patch numbers, so we
# rationalize that.
AS_VERSION=${number_string/\.0\.0/.0}
fi
}
FRESHEN_FML=
AS_VERSION=
Expand Down Expand Up @@ -193,7 +212,7 @@ else
AS_DOWNLOAD_URL="https://archive.mozilla.org/pub/app-services/releases/$AS_VERSION"
CHECKSUM_URL="$AS_DOWNLOAD_URL/nimbus-fml.sha256"
FML_URL="$AS_DOWNLOAD_URL/nimbus-fml.zip"
RELEASE_STATUS_CODE=$(curl -L --write-out '%{http_code}' --silent --output /dev/null "$CHECKSUM_URL" >/dev/null)
RELEASE_STATUS_CODE=$(curl -L --write-out '%{http_code}' --silent --output /dev/null "$CHECKSUM_URL" )
if [ "$RELEASE_STATUS_CODE" != "200" ]; then
AS_DOWNLOAD_URL="https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.nimbus-fml.$AS_VERSION/artifacts/public%2Fbuild%2F"
CHECKSUM_URL="${AS_DOWNLOAD_URL}nimbus-fml.sha256"
Expand Down