PLC Source Control - Working with GIT and TcXaeShell : Différence entre versions

[version en cours de rédaction]

Version du 5 mai 2022 à 13:00

Tutorial that outlines the steps that make up a typical TcXaeShell development cycle with GIR source control

Auteur Gareth Green | Dernière modification 9/05/2022 par Gareth Green en cours de rédaction ⧼frevu-button-review-label⧽

Pas encore d'image

Difficulté

Difficile

Durée

1 heure(s)

Tutorial that outlines the steps that make up a typical TcXaeShell development cycle with GIR source control

Difficulté

Difficile

Durée

1 heure(s)

Sommaire

1 Introduction
2 Tutoriels prérequis
3 Étape 1 - Making a branch
4 Étape 2 - Saving the changes
5 Étape 3 - Pushing changes to the Cloud Repo
6 Étape 4 - Add More Changes, Commit and Push
7 Étape 5 -
8 Commentaires

PLC, Source Control, GIT

Introduction

These steps outline typical actions that make up a development cycle for changing code on a machine, saving changes locally and to the cloud repository using Git as the Source control tool.

Tutoriels prérequis

Tutoriels prérequis

PLC Source Control - Create a Development Branch

PLC Source Control - Selecting GIT as the source control Plug-in

Étape 1 - Making a branch

Create a branch locally to hold the code involved with the changes.

See document for Making a Branch

The branch name is made up of three parts:

Machine Reference S095_ followed by an underscore character _
Service Job Number 1234567890_ followed by an underscore character _
Text that identifies the change Infeed, Outfeed, Timer Mod.

There may be more than one branch for changes under the service job. This method of naming aids traceability. For example S095_123454321_ClampMod and S095_123454321_InfeedTiming are two branches under the same job number.

Étape 2 - Saving the changes

The change has been saved as a local change.
Press Sync to save the changes to the cloud repository.

Étape 3 - Pushing changes to the Cloud Repo

Select Push
Message appears showing the successful push to the Origin which is in the remote cloud Repo

2.

Étape 4 - Add More Changes, Commit and Push

Add more changes to the code,
Commit each change as they are completed or as a group of changes. Add the Machine and job number to the Commit Message
Push changes to the remote Repo

This cycle of changing code and pushing to the cloud can be extensive and cover many hours work. By pushing to the cloud the work is backed up and code can be restored if needed.

Étape 5 -

Commentaires

en none 0 Draft

@@ Ligne 55 : / Ligne 55 : @@
 |Step_Picture_01=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Successful_Push_2022-05-05_112940.png
 |Step_Picture_01_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":563,"height":304,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.07,"scaleY":1.07,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/0/03/PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Successful_Push_2022-05-05_112940.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":342.5,"top":138,"width":41,"height":26,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":4,"strokeDashArray":null,"strokeLineCap":"round","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"x1":20.5,"x2":-20.5,"y1":13.000342860845961,"y2":-13.000342860845961,"x2a":-7.894372980660106,"y2a":4.466716635511401,"x2b":0.6744605976994835,"y2b":-9.04531841130435},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":363,"top":151,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":322,"top":125,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfnumberedbullet","version":"2.4.6","originX":"left","originY":"top","left":360,"top":142,"width":25,"height":25,"fill":"rgb(0,0,0)","stroke":"#FF0000","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"objects":[{"type":"circle","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":24,"height":24,"fill":"#FF0000","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":12,"startAngle":0,"endAngle":6.283185307179586},{"type":"text","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":7.79,"height":15.82,"fill":"rgba(255,255,255,255)","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"text":"2","fontSize":14,"fontWeight":"normal","fontFamily":"arial","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"styles":{} }],"number":2}],"height":324,"width":600}
+}}
+{{Tuto Step
+|Step_Title=<translate>Add More Changes,  Commit  and Push</translate>
+|Step_Content=<translate># Add more changes to the code,
+# Commit each change as they are completed or as a group of changes. Add the '''Machine'''  and job number to the '''Commit''' '''Message'''
+# Push changes to the remote Repo
+This cycle of changing code and pushing to the cloud can be extensive and cover many hours work.  By pushing to the cloud the work is backed up  and code can be restored  if needed.</translate>
+}}
+{{Tuto Step
+|Step_Title=<translate></translate>
+|Step_Content=<translate></translate>
 }}
 {{Notes}}