From 14029c484d9c21fd289dae5bb8b92b8eda174779 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Tue, 18 Aug 2020 20:53:46 -0400 Subject: primary branch is now 'main' --- .github/workflows/build.yml | 1 + .github/workflows/translations.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to '.github/workflows') 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 -- cgit v1.2.3