From e9c84037e58a0c68913c01cdf581a5a5524f659f Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Sep 2024 12:18:48 +0200 Subject: [PATCH 1/4] try to fix build_doc [skip ci] --- .github/workflows/build_doc.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index ba15781ddeb..7bc426e252e 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -32,6 +32,7 @@ jobs: runs-on: ubuntu-latest name: Checks if the workflow should be executed outputs: + trigger_build: ${{ steps.get_doc_version.outputs.result && steps.get_doc_version.outputs.result != '' }} force_build: ${{ steps.check_comment_body.outputs.force_build }} pr_number: ${{ steps.get_pr_number.outputs.pr_number }} doc_version: ${{ steps.get_doc_version.outputs.result }} @@ -53,24 +54,27 @@ jobs: exit 1 fi echo "force_build=${force_build}" >> $GITHUB_OUTPUT + echo "trigger_build=${trigger_build}" >> $GITHUB_OUTPUT - name: Check permissions - if: inputs.pr_number || env.author_association == 'OWNER' || env.author_association == 'MEMBER' + if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} && (inputs.pr_number || env.author_association == 'OWNER' || env.author_association == 'MEMBER') run: echo "Authorized" - name: No permissions - if: ${{ ! inputs.pr_number && env.author_association != 'OWNER' && env.author_association != 'MEMBER' }} + if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} && (! inputs.pr_number && env.author_association != 'OWNER' && env.author_association != 'MEMBER' ) run: | - echo "Not Authorized" + echo 'ERROR: User ${{ github.actor }} is not allowed to trigger the build of the documentation with /build:* or /force-build:*' exit 1 - name: Get PR number + if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} id: get_pr_number env: pr_number: ${{ inputs.pr_number || github.event.issue.number }} run: echo "pr_number=$pr_number" >> $GITHUB_OUTPUT - name: Get doc version + if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} uses: actions/github-script@v7 id: get_doc_version with: @@ -98,6 +102,7 @@ jobs: force_build: ${{ needs.pre_build_checks.outputs.force_build }} pr_number: ${{ needs.pre_build_checks.outputs.pr_number }} doc_version: ${{ needs.pre_build_checks.outputs.doc_version }} + if: ${{ fromJSON(needs.pre_build_checks.outputs.trigger_build) }} steps: - name: Emoji-comment From 634e9ac787dd04ba741e173cdd6004c3b9bd63a5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Sep 2024 14:35:38 +0200 Subject: [PATCH 2/4] actual fix of build_doc.yml [skip ci] --- .github/workflows/build_doc.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 7bc426e252e..cf84d97dfd1 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -1,4 +1,4 @@ -name: Documentation +name: Build Documentation on: workflow_dispatch: @@ -30,7 +30,7 @@ permissions: jobs: pre_build_checks: runs-on: ubuntu-latest - name: Checks if the workflow should be executed + name: Trigger the build? outputs: trigger_build: ${{ steps.get_doc_version.outputs.result && steps.get_doc_version.outputs.result != '' }} force_build: ${{ steps.check_comment_body.outputs.force_build }} @@ -57,24 +57,24 @@ jobs: echo "trigger_build=${trigger_build}" >> $GITHUB_OUTPUT - name: Check permissions - if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} && (inputs.pr_number || env.author_association == 'OWNER' || env.author_association == 'MEMBER') + if: ( steps.check_comment_body.outputs.trigger_build || false ) && (inputs.pr_number || env.author_association == 'OWNER' || env.author_association == 'MEMBER') run: echo "Authorized" - name: No permissions - if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} && (! inputs.pr_number && env.author_association != 'OWNER' && env.author_association != 'MEMBER' ) + if: ( steps.check_comment_body.outputs.trigger_build || false ) && (! inputs.pr_number && env.author_association != 'OWNER' && env.author_association != 'MEMBER' ) run: | echo 'ERROR: User ${{ github.actor }} is not allowed to trigger the build of the documentation with /build:* or /force-build:*' exit 1 - name: Get PR number - if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} + if: ( steps.check_comment_body.outputs.trigger_build || false ) id: get_pr_number env: pr_number: ${{ inputs.pr_number || github.event.issue.number }} run: echo "pr_number=$pr_number" >> $GITHUB_OUTPUT - name: Get doc version - if: ${{ fromJSON(steps.check_comment_body.outputs.trigger_build) }} + if: ( steps.check_comment_body.outputs.trigger_build || false ) uses: actions/github-script@v7 id: get_doc_version with: @@ -92,7 +92,8 @@ jobs: throw new Error('No version found') build_doc: - name: Build PR Documentation + name: | + ${{ format('{0}: Build Documentation version "{1}"', github.actor, needs.pre_build_checks.outputs.doc_version) }} needs: pre_build_checks permissions: contents: read # to fetch code (actions/checkout) From 6b366985e18fba5d3694d76e2c67a1a8f0c0d268 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Sep 2024 14:35:38 +0200 Subject: [PATCH 3/4] actual fix of build_doc.yml [skip ci] --- .github/workflows/build_doc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index cf84d97dfd1..e0813de0236 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -103,7 +103,7 @@ jobs: force_build: ${{ needs.pre_build_checks.outputs.force_build }} pr_number: ${{ needs.pre_build_checks.outputs.pr_number }} doc_version: ${{ needs.pre_build_checks.outputs.doc_version }} - if: ${{ fromJSON(needs.pre_build_checks.outputs.trigger_build) }} + if: ${{ fromJSON(needs.pre_build_checks.outputs.trigger_build || false) }} steps: - name: Emoji-comment From 4dfb8d30fc728d2acf2b5ddfc1e1a5c130575f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 24 Sep 2024 15:37:04 +0200 Subject: [PATCH 4/4] update tested branches --- .../bin/create_internal_release_of_the_day.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py index ab1b640f42a..8448203c673 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py @@ -8,17 +8,17 @@ import os import datetime import locale import argparse -from cgal_release import release, integration, master, beta_release, master, beta_release_from_master +from cgal_release import release, integration, master, beta_release, beta_release_from_master # Define a dictionary that maps day of the week to an action actions = { "Monday": integration, - "Tuesday": release("5.5"), #integration, - "Wednesday": release("5.6"), #integration, + "Tuesday": integration, + "Wednesday": integration, "Thursday": integration, "Friday": release("5.5"), "Saturday": release("5.6"), - "Sunday": beta_release_from_master(2), + "Sunday": master, }