Skip to content

Downloading translations and ignoring branch at Crowdin #2592

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

Closed
wants to merge 25 commits into from
Closed

Downloading translations and ignoring branch at Crowdin #2592

Changes from 3 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
73041f3
Adding download translations and ignoring branch
jonasfranz Sep 23, 2017
6e178ea
Adding git-push
jonasfranz Sep 26, 2017
593fae2
Merge branch 'master' into patch-1
jonasfranz Sep 26, 2017
1db4eab
Update .drone.yml
jonasfranz Sep 26, 2017
9d36fac
Merge branch 'master' into patch-1
jonasfranz Oct 13, 2017
514006a
Fix orgnization user watch repository (#2670)
lunny Oct 14, 2017
e89bb7e
Allow custom SSH user in UI for built-in SSH server (#2617) (#2678)
pgaskin Oct 14, 2017
8863e74
Fix organization watch migration (#2703)
lafriks Oct 14, 2017
f42dbdb
Add Activity page to repository (#2674)
lafriks Oct 14, 2017
32ca299
Remove direct user adding to organization members (#2641)
lafriks Oct 15, 2017
1ec4dc6
Fix so that user can still fork his own repository to owned organizat…
lafriks Oct 15, 2017
4ccb0fe
fix .netrc authentication (#2700)
daviian Oct 15, 2017
c25303b
Fix activity locale (#2709)
ethantkoenig Oct 15, 2017
f3833b7
Create new branch from branch selection dropdown (#2130)
lafriks Oct 15, 2017
c7f4f07
Integration test for activity page (#2704)
lafriks Oct 15, 2017
a75d5c7
Fix plain readme didn't render correctly on repo home page (#2705)
lunny Oct 16, 2017
c1b0c9e
Fix PR, milestone and label functionality if issue unit is disabled (…
lafriks Oct 16, 2017
9e865ce
Merge password and 2fa page on user settings (#2695)
lunny Oct 16, 2017
33647aa
Fixing wrong translations on sorttype oldest/latest (#2720)
jonasfranz Oct 16, 2017
f4190f8
Render plain text README.txt monospaced (#2721)
jonasfranz Oct 16, 2017
af4a094
Fix semantic-ui style conflict with v-cloak (#2722)
lafriks Oct 17, 2017
dc4b941
Adding download translations and ignoring branch
jonasfranz Sep 23, 2017
6c95098
Adding git-push
jonasfranz Sep 26, 2017
baebafe
Update .drone.yml
jonasfranz Sep 26, 2017
fe8c55f
Merge remote-tracking branch 'jonas/patch-1' into patch-1
jonasfranz Oct 17, 2017
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
38 changes: 36 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,31 @@ clone:
tags: true

pipeline:
download_translations:
image: jonasfranz/crowdin
pull: true
secrets: [ crowdin_key ]
project_identifier: gitea
ignore_branch: true
download: true
export_dir: options/locale/
when:
event: [ push ]
branch: [ master ]

git_push:
image: appleboy/drone-git-push
pull: true
secrets: [ git_push_ssh_key ]
remote: "[email protected]:go-gitea/gitea.git"
Copy link
Member

Choose a reason for hiding this comment

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

I think we don't need the remote

branch: master
Copy link
Member

Choose a reason for hiding this comment

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

The branch should be already master?

force: false
commit: true
commit_message: "[skip ci] Updated translations via Crowdin"
when:
event: [ push ]
branch: [ master ]

pre-build:
image: webhippie/nodejs:latest
pull: true
Expand All @@ -17,6 +42,7 @@ pipeline:
- make stylesheets-check
when:
event: [ push, tag, pull_request ]

build:
image: webhippie/golang:edge
pull: true
Expand Down Expand Up @@ -211,8 +237,16 @@ pipeline:
when:
event: [ push ]
branch: [ master ]

translations:

github:
Copy link
Member

Choose a reason for hiding this comment

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

This section seems not related?

Copy link
Member

Choose a reason for hiding this comment

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

@JonasFranzDEV why this section is needed here?

Copy link
Member

Choose a reason for hiding this comment

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

@lunny @lafriks As you can see in comments: this was a merge from master to pr branch. Think a full rebase is necessary.

Copy link
Member Author

Choose a reason for hiding this comment

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

@daviian What should I do for a "full rebase"?

Copy link
Member

Choose a reason for hiding this comment

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

git rebase master?

Copy link
Member

Choose a reason for hiding this comment

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

@JonasFranzDEV Usually I rebase my master to be the same as upstream/master (original gitea remote) and after checking out my pr branch I do it like @Morlinest said.

image: plugins/github-release:1
pull: true
files:
- dist/release/*
when:
event: [ tag ]

upload_translations:
image: jonasfranz/crowdin
pull: true
secrets: [ crowdin_key ]
Expand Down