Merge remote-tracking branch 'cgal/master' into List-third-party-libraries-GF

This commit is contained in:
Laurent Rineau 2024-09-24 15:38:15 +02:00
commit b5f95fe315
2 changed files with 16 additions and 10 deletions

View File

@ -1,4 +1,4 @@
name: Documentation name: Build Documentation
on: on:
workflow_dispatch: workflow_dispatch:
@ -30,8 +30,9 @@ permissions:
jobs: jobs:
pre_build_checks: pre_build_checks:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Checks if the workflow should be executed name: Trigger the build?
outputs: outputs:
trigger_build: ${{ steps.get_doc_version.outputs.result && steps.get_doc_version.outputs.result != '' }}
force_build: ${{ steps.check_comment_body.outputs.force_build }} force_build: ${{ steps.check_comment_body.outputs.force_build }}
pr_number: ${{ steps.get_pr_number.outputs.pr_number }} pr_number: ${{ steps.get_pr_number.outputs.pr_number }}
doc_version: ${{ steps.get_doc_version.outputs.result }} doc_version: ${{ steps.get_doc_version.outputs.result }}
@ -53,24 +54,27 @@ jobs:
exit 1 exit 1
fi fi
echo "force_build=${force_build}" >> $GITHUB_OUTPUT echo "force_build=${force_build}" >> $GITHUB_OUTPUT
echo "trigger_build=${trigger_build}" >> $GITHUB_OUTPUT
- name: Check permissions - name: Check permissions
if: 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" run: echo "Authorized"
- name: No permissions - name: No permissions
if: ${{ ! 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: | 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 exit 1
- name: Get PR number - name: Get PR number
if: ( steps.check_comment_body.outputs.trigger_build || false )
id: get_pr_number id: get_pr_number
env: env:
pr_number: ${{ inputs.pr_number || github.event.issue.number }} pr_number: ${{ inputs.pr_number || github.event.issue.number }}
run: echo "pr_number=$pr_number" >> $GITHUB_OUTPUT run: echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
- name: Get doc version - name: Get doc version
if: ( steps.check_comment_body.outputs.trigger_build || false )
uses: actions/github-script@v7 uses: actions/github-script@v7
id: get_doc_version id: get_doc_version
with: with:
@ -88,7 +92,8 @@ jobs:
throw new Error('No version found') throw new Error('No version found')
build_doc: 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 needs: pre_build_checks
permissions: permissions:
contents: read # to fetch code (actions/checkout) contents: read # to fetch code (actions/checkout)
@ -98,6 +103,7 @@ jobs:
force_build: ${{ needs.pre_build_checks.outputs.force_build }} force_build: ${{ needs.pre_build_checks.outputs.force_build }}
pr_number: ${{ needs.pre_build_checks.outputs.pr_number }} pr_number: ${{ needs.pre_build_checks.outputs.pr_number }}
doc_version: ${{ needs.pre_build_checks.outputs.doc_version }} doc_version: ${{ needs.pre_build_checks.outputs.doc_version }}
if: ${{ fromJSON(needs.pre_build_checks.outputs.trigger_build || false) }}
steps: steps:
- name: Emoji-comment - name: Emoji-comment

View File

@ -8,17 +8,17 @@ import os
import datetime import datetime
import locale import locale
import argparse 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 # Define a dictionary that maps day of the week to an action
actions = { actions = {
"Monday": integration, "Monday": integration,
"Tuesday": release("5.5"), #integration, "Tuesday": integration,
"Wednesday": release("5.6"), #integration, "Wednesday": integration,
"Thursday": integration, "Thursday": integration,
"Friday": release("5.5"), "Friday": release("5.5"),
"Saturday": release("5.6"), "Saturday": release("5.6"),
"Sunday": beta_release_from_master(2), "Sunday": master,
} }