.gitea/workflows/auto_pr.yaml

@@ -6,7 +6,6 @@ on:
         branches:
             - auto-*
             - workflow_update
-            - pis-*
 
 jobs:
     validate_and_release:
@@ -32,4 +31,14 @@ jobs:
                   commit_message: Sort & Merge PIS Files
                   commit_user_name: owlbot
                   commit_user_email: owlbot@owlboard.info
-                  commit_author: owlbot <owlbot@owlboard.info>
+                  commit_author: owlbot <owlbot@owlboard.info>
+
+            - name: Create PR
+              uses: https://github.com/peter-evans/create-pull-request@v6
+              with:
+                  token: ${{ secrets.OWLBOT_KEY }}
+                  committer: OwlBot <owlbot@owlboard.info>
+                  signoff: true
+                  title: Merge Changes
+                  reviewers: fred.boniface
+                  branch: main

pis/auto-20240706-145015.yaml

@@ -0,0 +1,216 @@
+  - code: "6215"
+    stops: [exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri,fit,pwy,stj,nwp,cdf]
+  - code: "1776"
+    stops: [rdg,did,rad,oxf]
+  - code: "1785"
+    stops: [pad,rdg,the,tha,nrc,nby]
+  - code: "1786"
+    stops: [nby,nrc,tha,the,rdg,pad]
+  - code: "1787"
+    stops: [did,cho,gor,pan,tlh,rdg,twy,mai,slo,lny,ivr,wdt,hay,stl,eal]
+  - code: "6370"
+    stops: [bri,bth,boa,tro,wsb]
+  - code: "6371"
+    stops: [swi,bpw,gcr,cnm]
+  - code: "1768"
+    stops: [oxf,rad,did,rdg]
+  - code: "1769"
+    stops: [eal,slo,mai,twy,rdg]
+  - code: "1751"
+    stops: [pad,slo,mai,twy,rdg,tlh,gor,cho,did]
+  - code: "1754"
+    stops: [pad,slo,mai,twy,rdg,tlh,gor,cho,did]
+  - code: "1755"
+    stops: [pad,slo,bnm,mai,twy,rdg,tlh,gor,cho,did]
+  - code: "1551"
+    stops: [pad,rdg,rdw,the,amt,mdg,tha,nrc,nby]
+  - code: "0368"
+    stops: [rdg,wkm,crn,snd,baw,fnn,ncm,ash,gld,sfr,chl,gom,dkt,dpd,bto,rei,rdh]
+    
+  - code: "6326"
+    #headcode: 1F09
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: "6328"
+    #headcode: 1F06
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
+  - code: "6324"
+    #headcode: 1F24
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,lwh,srd,fit,bpw]
+  - code: "6342"
+    #headcode: 1F27
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: "6323"
+    #headcode: 1F29
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: "6338"
+    #headcode: 1D91
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: "6325"
+    #headcode: 1F26
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,kyn,bri,lwh,srd,fit,bpw]
+  - code: "6345"
+    #headcode: 1F33
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: "6327"
+    #headcode: 1F05
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: "6340"
+    #headcode: 1F04
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
+  - code: "6344"
+    #headcode: 1J37
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,kyn,bth,boa,tro,wsb,fro]
+  - code: "6341"
+    #headcode: 1F07
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: "6343"
+    #headcode: 2C95
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bpw,fit,srd,lwh,bri]
+  - code: "6346"
+    #headcode: 1F34
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,lwh,srd,fit,bpw]
+  - code: "6309"
+    #headcode: 2C61
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [bri,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: "6307"
+    #headcode: 2C03
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [exd,dwl,tgm,nta,tot,ivy,ply,dpt,doc,key,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: "6348"
+    #headcode: 2U34
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [exm,lym,lyc,exn,top,nco,dig,pol,sjp,exc,exd,tau,bwt,hig,wsm,wor,yat,nls,bri]
+  - code: "6373"
+    #headcode: 2V69
+    #date: 2024-07-02 00:00:00
+    #source_file: 0702 TO SC CNDR.docx
+    stops: [clc,bru,fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit]
+  - code: "6322"
+    #headcode: 1F33
+    #date: 2024-06-07 00:00:00
+    #source_file: 0607 West CNDR 6th July - Main Isuue SCP.docx
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: "6317"
+    #headcode: 2V96
+    #date: 2024-06-07 00:00:00
+    #source_file: 0607 West CNDR 6th July - Main Isuue SCP.docx
+    stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: "6313"
+    #headcode: 2C30
+    #date: 2024-06-07 00:00:00
+    #source_file: 0607 West CNDR 6th July - Main Isuue SCP.docx
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
+  - code: "6314"
+    #headcode: 2F19
+    #date: 2024-06-07 00:00:00
+    #source_file: 0607 West CNDR 6th July - Main Isuue SCP.docx
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,dig,nco,top,lym,exm]
+  - code: "6329"
+    #headcode: 1F14
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: "6332"
+    #headcode: 1O37
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: "6319"
+    #headcode: 2C98
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc]
+  - code: "6321"
+    #headcode: 2M15
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [clc,bru,fro,wsb,tro,mkm,cpm,swi]
+  - code: "6334"
+    #headcode: 1V32
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
+  - code: "6333"
+    #headcode: 1O39
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: "6336"
+    #headcode: 2C42
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [bpw,bri]
+  - code: "6337"
+    #headcode: 2V34
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
+  - code: "6320"
+    #headcode: 2E30
+    #date: 2024-07-07 00:00:00
+    #source_file: 0707 SuO 7th July 2024 - West CNDR Scards - Main Issue.docx
+    stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,dpt,ply,ivy,tot,nta,tgm,dwl,exd]
+  - code: "6349"
+    #headcode: 2V69
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [yvp,clc,bru,fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+## THIS CODE REQUIRES MANUAL VERIFICATION
+  - code: "6311"
+    #headcode: 2N06
+    #date: 2024-07-08 00:00:00
+    #source_file: 0708 MO SC CNDR.docx
+    stops: [pnz,ser,hyl,cbn,red,tru,sau,par,lux,bgl,roc,scr,qui,nqy]
+    
+  - code: "6329"
+    #headcode: 1F14
+    #date: 2024-05-19 00:00:00
+    #source_file: 0519 SuO 19th May 2024 - West Drivers SCards - Main Issue.docx
+    stops: [pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: "6215"
+    #headcode: 2U24
+    #date: 2024-05-19 00:00:00
+    #source_file: 0519 SuO 19th May 2024 - West Drivers SCards - Main Issue.docx
+    stops: [exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri,fit,pwy,stj,nwp,cdf]
+  - code: "6373"
+    #headcode: 2V69
+    #date: 2024-05-24 00:00:00
+    #source_file: 0524 FO SC DVR.docx
+    stops: [clc,bru,fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit]
+  - code: "1751"
+    #headcode: 1D96
+    #date: 2024-05-24 00:00:00
+    #source_file: 0524 FO 24 May LTV DVR SCards - Main Issue.docx
+    stops: [pad,slo,mai,twy,rdg,tlh,gor,cho,did]

scripts/merge-yaml.js

@@ -31,17 +31,14 @@ function sortAndMergeYAMLFiles() {
             return codeA - codeB
         })
 
-        
+        const mergedYaml = yaml.stringify(mergedData);
 
-        // Construct the output string, removing duplicates
+        // Construct the output string
         let outputString = "pis:\n";
-        const seenCodes = new Set();
         mergedData.forEach(item => {
-            if (!seenCodes.has(item.code) && item.stops.length > 0) {
-                seenCodes.add(item.code);
+            if (item.stops.length > 0) {
                 outputString += `  - code: "${item.code}"\n`;
                 outputString += `    stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`;
-                outputString += `    toc: "${item.toc || "gw"}"\n`;
             }
         });
 
@@ -52,9 +49,8 @@ function sortAndMergeYAMLFiles() {
             console.error("Error writing gw.pis", err)
         }
 
-        // Remove any files created by dgp2
         files.forEach(file => {
-            if (file.startsWith('auto-')) {
+            if (file.startsWith('dg_parser')) {
                 fs.unlinkSync(directoryPath + file);
                 console.log(`Deleted file: ${file}`);
             }