From 7ba7d5e6522c8b0b95792709b4cd31bc94af13bd Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Tue, 20 Oct 2026 16:01:56 +0200 Subject: [PATCH 1/2] fix: allow merge commits in the commit message check --- .github/workflows/semantic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml index 0a59eed6..2f396c69 100644 --- a/.github/workflows/semantic.yml +++ b/.github/workflows/semantic.yml @@ -15,13 +15,13 @@ jobs: - name: Check Commit Format uses: gsactions/commit-message-checker@v1 with: - pattern: '^(docs|feat|fix|refactor|style|test)( ?\(.*\))?: .+$' + pattern: '^(docs|feat|fix|refactor|style|test)( ?\(.*\))?: .+$|^Merge .+$' excludeDescription: 'true' # optional: this excludes the description body of a pull request excludeTitle: 'true' # optional: this excludes the title of a pull request checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request accessToken: ${{ secrets.GITHUB_TOKEN }} # github access token is only required if checkAllCommitMessages is true flags: 'gm' - error: 'Your commit has to follow the format "(): "".' + error: 'Your commit has to follow the format "(): ".' - name: Check Commit Length uses: gsactions/commit-message-checker@v1 with: From 5d9e685d1f80ac070d81af676450ea1a9293972d Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Tue, 20 Oct 2026 16:01:56 +0200 Subject: [PATCH 2/2] fix: skip integration tests on the central DIRACGrid repository --- .github/workflows/integration.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f78c3210..b5a29841 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -4,6 +4,7 @@ on: [push] jobs: local_install: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -60,6 +61,7 @@ jobs: X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug release_cvmfs_CEs: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -116,6 +118,7 @@ jobs: X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript=dirac-platform --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --pilotUUID="${pilotUUID}" --debug matching: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -166,6 +169,7 @@ jobs: X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::integration -M 1 -N jenkins-full.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --wnVO=dteam --pilotUUID="${pilotUUID}" --debug release_cvmfs_matching: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -216,6 +220,7 @@ jobs: X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-full.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=${{ matrix.VO }} -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug release_prod-cvmfs_matching_CEs: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -276,6 +281,7 @@ jobs: #### LHCb ext-lhcb_integration: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: @@ -331,6 +337,7 @@ jobs: X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py -M 1 -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --architectureScript=dirac-architecture --wnVO=LHCb -o lbRunOnly --pilotUUID="${pilotUUID}" --debug ext-lhcb_integration_cvmfs: + if: github.repository_owner != 'DIRACGrid' runs-on: ubuntu-latest strategy: