From faf25273ebb7cb3ba0dbcf0cba824fb10ee302a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:01:59 +0100 Subject: [PATCH 1/5] Add a synchronization job. --- .github/workflows/sync.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/sync.yml diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml new file mode 100644 index 00000000000..2688a480248 --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,26 @@ +name: Synchronize branches + +on: + push: + branches: [master] + +permissions: + contents: write + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Synchronize + run: | + git checkout master + git fetch origin + git checkout windows-testing + git pull + git merge origin/master + git push origin windows-testing \ No newline at end of file From e1eff042a15bef48f2d180b41b7968ac7ecf5e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:04:53 +0100 Subject: [PATCH 2/5] add LF --- .github/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 2688a480248..a85bc5f21dc 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -23,4 +23,4 @@ jobs: git checkout windows-testing git pull git merge origin/master - git push origin windows-testing \ No newline at end of file + git push origin windows-testing From 21647b5dfc9d0b62187e16be74e9e4f66ac19313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:06:42 +0100 Subject: [PATCH 3/5] update checkout action version --- .github/workflows/sync.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index a85bc5f21dc..2d8444975c8 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -11,8 +11,7 @@ jobs: sync: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From f776e659827c81589e12a2fcb979b8b7927bd4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:23:03 +0100 Subject: [PATCH 4/5] run linux jobs conditioned to branch title --- .github/workflows/main.yml | 1 + .github/workflows/sync.yml | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .github/workflows/sync.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77f59065763..242d229d1cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ env: jobs: ubuntu: + if: "!endsWith(github.event.pull_request.title, '[ci-windows]')" runs-on: ubuntu-latest name: Python ${{ matrix.python }} (Docutils ${{ matrix.docutils }}) strategy: diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml deleted file mode 100644 index 2d8444975c8..00000000000 --- a/.github/workflows/sync.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Synchronize branches - -on: - push: - branches: [master] - -permissions: - contents: write - -jobs: - sync: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Synchronize - run: | - git checkout master - git fetch origin - git checkout windows-testing - git pull - git merge origin/master - git push origin windows-testing From 47af994f1796a5e546826d6993287e18848c1446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:40:22 +0100 Subject: [PATCH 5/5] update workflows --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 242d229d1cc..d76031678cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ env: jobs: ubuntu: - if: "!endsWith(github.event.pull_request.title, '[ci-windows]')" + if: "!contains(github.event.pull_request.title, '[ci-skip-linux]')" runs-on: ubuntu-latest name: Python ${{ matrix.python }} (Docutils ${{ matrix.docutils }}) strategy: @@ -74,6 +74,7 @@ jobs: PYTHONWARNINGS: "error" # treat all warnings as errors windows: + if: "!contains(github.event.pull_request.title, '[ci-skip-windows]')" runs-on: windows-2019 name: Windows @@ -95,6 +96,7 @@ jobs: PYTHONWARNINGS: "error" # treat all warnings as errors docutils-latest: + if: "!contains(github.event.pull_request.title, '[ci-skip-docutils-head]')" runs-on: ubuntu-latest name: Docutils HEAD