diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml index 30db90407..764fa9a93 100644 --- a/.github/workflows/fixup.yml +++ b/.github/workflows/fixup.yml @@ -7,8 +7,6 @@ name: Pull request checks on: pull_request: - branches: - - '!update-l10n' jobs: commit-message-check: diff --git a/.github/workflows/generate_catalog_templates.yml b/.github/workflows/generate_catalog_templates.yml index f8cbcc2e7..2d843f965 100644 --- a/.github/workflows/generate_catalog_templates.yml +++ b/.github/workflows/generate_catalog_templates.yml @@ -3,43 +3,43 @@ on: workflow_dispatch: push: branches: - - master + - master paths: - - 'user_manual/**' - - '!user_manual/locale/**' + - 'user_manual/**' + - '!user_manual/locale/**' jobs: user_manual: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - uses: ammaraskar/sphinx-action@master - with: - docs-folder: "user_manual/" - pre-build-command: pip install -r requirements.txt - build-command: make gettext + - uses: ammaraskar/sphinx-action@master + with: + docs-folder: "user_manual/" + pre-build-command: pip install -r requirements.txt + build-command: make gettext - - uses: peter-evans/create-pull-request@v4 - id: cpr - with: - token: ${{ secrets.COMMAND_BOT_PAT }} - commit-message: "chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)" - title: Updates catalog templates - branch: update-l10n - signoff: true + - uses: peter-evans/create-pull-request@v4 + id: cpr + with: + token: ${{ secrets.COMMAND_BOT_PAT }} + commit-message: "chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)" + title: Updates catalog templates + branch: update-l10n + signoff: true - - uses: pascalgn/automerge-action@v0.15.6 - if: steps.cpr.outputs.pull-request-operation == 'created' - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_LABELS: "" - MERGE_RETRIES: 10 - MERGE_RETRY_SLEEP: 60000 - PULL_REQUEST: ${{ github.event.inputs.pull-request-number }} + - uses: hmarr/auto-approve-action@v2.2.1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - - uses: hmarr/auto-approve-action@v2.2.1 - if: steps.cpr.outputs.pull-request-operation == 'created' - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - pull-request-number: ${{ github.event.inputs.pull-request-number }} + - uses: pascalgn/automerge-action@v0.15.6 + if: steps.cpr.outputs.pull-request-operation == 'created' + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "" + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000 + PULL_REQUEST: ${{ steps.cpr.outputs.pull-request-number }} diff --git a/.github/workflows/sphinxbuild.yml b/.github/workflows/sphinxbuild.yml index 36787a9bb..4b5c7728f 100644 --- a/.github/workflows/sphinxbuild.yml +++ b/.github/workflows/sphinxbuild.yml @@ -6,7 +6,6 @@ on: branches: - master - stable* - - '!update-l10n' jobs: user_manual: @@ -26,6 +25,7 @@ jobs: with: name: User manual.zip path: "/tmp/documentation.tar.gz" + user_manual-en: runs-on: ubuntu-latest steps: @@ -35,6 +35,7 @@ jobs: docs-folder: "user_manual/" pre-build-command: pip install -r requirements.txt build-command: make html-lang-en + developer_manual: runs-on: ubuntu-latest steps: @@ -52,6 +53,7 @@ jobs: with: name: Developer manual.zip path: "/tmp/documentation.tar.gz" + admin_manual: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml index 18d807f23..74927abee 100644 --- a/.github/workflows/transifex.yml +++ b/.github/workflows/transifex.yml @@ -1,8 +1,6 @@ name: AutoMerge Transifex Pull Requests on: pull_request: - branches: - - '!update-l10n' jobs: approve: