diff options
| author | Lex Neva <lexelby@users.noreply.github.com> | 2020-08-18 21:02:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 21:02:10 -0400 |
| commit | be671f837f074ee70d51a182073dc7dc2bd9299f (patch) | |
| tree | 2fc0c4418a650d4a144b24be0431c3c68208dbec /.github/workflows | |
| parent | 10863c9e1f471108d59447bc270976457565672f (diff) | |
| parent | 3d9065249294ff956d0c11f717794999edef52d5 (diff) | |
Merge pull request #792 from inkstitch/master
switch to main
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/translations.yml | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d821afb..391db4c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,7 @@ on: push: branches-ignore: - master + - main tags: - "v*" jobs: diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 5db06b56..b907e52d 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - ref: master + ref: main token: ${{secrets.INKSTITCH_BUILDS_GITHUB_TOKEN}} - name: checkout submodules run: | @@ -32,10 +32,10 @@ jobs: make messages.po echo "uploading messages.po to crowdin" - java -jar crowdin-cli.jar -v upload -b master + java -jar crowdin-cli.jar -v upload -b main echo "downloading new translations" - java -jar crowdin-cli.jar -v pull -b master + java -jar crowdin-cli.jar -v pull -b main # Try to only commit if translations changed. Crowdin will update all # files when a new translation string is added but we don't need to @@ -43,5 +43,5 @@ jobs: if git diff translations | grep -qE '^[-+]msgstr ".+"$'; then git add translations git commit -m "new translations from Crowdin" - git push https://github.com/inkstitch/inkstitch master + git push https://github.com/inkstitch/inkstitch main fi |