Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Import strings from android-l10n. #26681

Merged

Conversation

mozilla-l10n-automation-bot
Copy link
Collaborator

n/t

@Mugurell
Copy link
Contributor

Mugurell commented Aug 29, 2022

Not sure what's changed but the error message makes sens:

executing ['git', 'clone', 'https://github.com/mozilla-mobile/fenix', '/builds/worker/checkouts/src']
Cloning into '/builds/worker/checkouts/src'...
executing ['git', 'fetch', '--tags', 'https://github.com/mozilla-l10n-automation-bot/fenix', 'import-l10n']
From https://github.com/mozilla-l10n-automation-bot/fenix

  • branch import-l10n -> FETCH_HEAD
    ! [rejected] v2.1.0 -> v2.1.0 (would clobber existing tag)

Whereas previously (like in #26654) we would see

executing ['git', 'clone', 'https://github.com/mozilla-mobile/fenix', '/builds/worker/checkouts/src']
Cloning into '/builds/worker/checkouts/src'...
executing ['git', 'fetch', '--tags', 'https://github.com/mozilla-l10n-automation-bot/fenix', 'import-l10n']
From https://github.com/mozilla-l10n-automation-bot/fenix

  • branch import-l10n -> FETCH_HEAD
    t [tag update] v2.1.0 -> v2.1.0

We could --force the update or stop fetching the tags but looking at https://github.com/mozilla-l10n-automation-bot/fenix/tags looks like they're there from when fenix was forked to this new project but atm serve no real purpose (given that the newest tag for Fenix - 2.1.0 is from 3 years ago) so a quick fix with no scripts modifications would be to just delete them and prevent them being a nuisance in the future also. (For other projects like A-C also).
@JohanLorenzo @jcristau

@jcristau
Copy link
Contributor

I've deleted the conflicting tag.

@jcristau jcristau closed this Aug 29, 2022
@jcristau jcristau reopened this Aug 29, 2022
Copy link
Contributor

@mergify mergify bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 😎

@mergify mergify bot merged commit 82e86a8 into mozilla-mobile:main Aug 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants