Migrate VarTools from Jenkins to Github Actions #11
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| * -text | ||
| *.exe filter=lfs diff=lfs merge=lfs -text |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # This workflow will run build an AS project and publish the libraries to the github package registry | ||
|
|
||
| name: Build Libraries | ||
|
|
||
| on: | ||
| push: | ||
| branches-ignore: | ||
| - 'main' | ||
|
|
||
| jobs: | ||
| build-libraries: | ||
| runs-on: [AS411] | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: 'true' | ||
| path: "main" | ||
| lfs: true | ||
| - name: Fix LFS | ||
| run: | | ||
| cd ./main | ||
| git lfs pull | ||
Joshpolansky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - name: Install AS upgrades | ||
| run: python.exe C:/Tools/AsPython/InstallUpgrades.py ${{ github.workspace }}/main/upgrades -asp AS411 -r --logLevel DEBUG | ||
|
There was a problem hiding this comment. Looks like this is dependent upon AsPython already existing on the runner, right? This feels like the correct way to do it in general, but how do you propose we handle AsPython changes if for example we only want a subset of all repos to use a new version? There was a problem hiding this comment. The runner will have AsPython main (pulled daily). IF you wanted a specific version, no problem. Add a checkout and use that instead. Example: # This workflow will run build an AS project and publish the libraries to the github package registry
name: Build Libraries
on:
push:
branches-ignore:
- 'main'
jobs:
build-libraries:
runs-on: [AS411]
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
with:
submodules: 'true'
path: "main"
lfs: true
- uses: actions/checkout@v4
with:
repository: "loupeteam/ASPython"
submodules: 'true'
ref: "bugfix/pvi-error-code"
path: "AsPython"
- name: Fix LFS
run: |
cd ./main
git lfs pull
- name: Install AS upgrades
shell: pwsh
run: |
Set-Location -Path ./main/upgrades
& $PWD/install.ps1
- run: python.exe ./AsPython/CmdLineBuild.py ./main/example/AsProject/AsProject.apj -c Intel ARM -bm Rebuild -sim --logLevel DEBUG
- run: python.exe ./AsPython/CmdLineExportLib.py ./main/example/AsProject/AsProject.apj -dest ./libs -c Intel ARM -wl vartools -l DEBUG -o -bm "None" |
||
| - name: Build project | ||
| run: python.exe C:/Tools/AsPython/CmdLineBuild.py ${{ github.workspace }}/main/example/AsProject/AsProject.apj -c Intel ARM -bm Rebuild -sim --logLevel DEBUG | ||
| - name: Export libraries | ||
| run: python.exe C:/Tools/AsPython/CmdLineExportLib.py ${{ github.workspace }}/main/example/AsProject/AsProject.apj -dest ./libs -c Intel ARM -wl vartools -l DEBUG -o -bm "None" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # This workflow will run build an AS project and publish the libraries to the github package registry | ||
|
|
||
| name: Build Publish Libraries | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| tags: | ||
| - v* | ||
|
There was a problem hiding this comment. I think this setup with the two workflows makes sense - you want to auto-build and export commits from all branches except for There was a problem hiding this comment. That is correct. I think maybe a better solution would be one workflow that has steps that are conditional but I didnt want to spend time on that yet. |
||
|
|
||
| jobs: | ||
| build-publish-libraries: | ||
| runs-on: [AS411] | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: 'true' | ||
| path: "main" | ||
| lfs: true | ||
| - name: Fix LFS | ||
| run: | | ||
| cd ./main | ||
| git lfs pull | ||
| - name: Install AS upgrades | ||
| run: python.exe C:/Tools/AsPython/InstallUpgrades.py ${{ github.workspace }}/main/upgrades -asp AS411 -r --logLevel DEBUG | ||
| - name: Build project | ||
| run: python.exe C:/Tools/AsPython/CmdLineBuild.py ${{ github.workspace }}/main/example/AsProject/AsProject.apj -c Intel ARM -bm Rebuild -sim --logLevel DEBUG | ||
| - name: Export libraries | ||
| run: python.exe C:/Tools/AsPython/CmdLineExportLib.py ${{ github.workspace }}/main/example/AsProject/AsProject.apj -dest ./libs -c Intel ARM -wl vartools -l DEBUG -o -bm "None" | ||
| - name: Publish libraries | ||
| run: | | ||
| cd ./libs/vartools | ||
| python.exe C:/Tools/LPM/src/LPM.py login -s -t ${{ secrets.GITHUB_TOKEN }} -nc | ||
| python.exe C:/Tools/LPM/src/LPM.py init -s -lib -nc | ||
| python.exe C:/Tools/LPM/src/LPM.py publish -s -nc | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio Version="4.11.4.55 SP" WorkingVersion="4.11"?> | ||
| <Project Description="Starter Automation Studio project." Version="1.00.0" Edition="Standard" EditionComment="Standard" xmlns="http://br-automation.co.at/AS/Project"> | ||
| <Communication /> | ||
| <ANSIC DefaultIncludes="true" /> | ||
| <IEC ExtendedConstants="true" IecExtendedComments="true" KeywordsAsStructureMembers="false" NamingConventions="true" Pointers="true" Preprocessor="false" /> | ||
| <Motion RestartAcoposParameter="true" RestartInitParameter="true" /> | ||
| <Project StoreRuntimeInProject="false" /> | ||
| <Variables DefaultInitValue="0" DefaultRetain="false" DefaultVolatile="true" /> | ||
| <TechnologyPackages> | ||
| <Acp10Arnc0 Version="5.15.1" /> | ||
| </TechnologyPackages> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| #include <bur/plctypes.h> | ||
| #ifdef _DEFAULT_INCLUDES | ||
| #include <AsDefault.h> | ||
| #endif | ||
| void _INIT ProgramInit(void) | ||
| { | ||
| } | ||
| void _CYCLIC ProgramCyclic(void) | ||
| { | ||
| varGetValue(&var); | ||
| } | ||
| void _EXIT ProgramExit(void) | ||
| { | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,3 @@ | ||
| VAR | ||
| var : varVariable_typ; | ||
| END_VAR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,29 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio FileVersion="4.9"?> | ||
| <Cpu xmlns="http://br-automation.co.at/AS/Cpu"> | ||
| <Objects> | ||
| <Object Type="File" Description="Software configuration">Cpu.sw</Object> | ||
| <Object Type="File" Description="Permanent variables">Cpu.per</Object> | ||
| <Object Type="File" Description="I/O mapping">IoMap.iom</Object> | ||
| <Object Type="File" Description="Variable mapping">PvMap.vvm</Object> | ||
| <Object Type="Package">Connectivity</Object> | ||
| <Object Type="Package">TextSystem</Object> | ||
| <Object Type="Package">UnitSystem</Object> | ||
| <Object Type="Package">AccessAndSecurity</Object> | ||
| <Object Type="Package">mappControl</Object> | ||
| <Object Type="Package">mappMotion</Object> | ||
| <Object Type="Package">mappServices</Object> | ||
| <Object Type="Package">mappView</Object> | ||
| <Object Type="Package">mappVision</Object> | ||
| <Object Type="Package">mappCockpit</Object> | ||
| <Object Type="Package">Motion</Object> | ||
| </Objects> | ||
| <Configuration ModuleId="5PC900.TS17-04"> | ||
| <AutomationRuntime Version="C4.90" /> | ||
| <Build GccVersion="6.3.0" PreBuildStep="" /> | ||
| <DefaultTargetMemory Tasks="UserROM" /> | ||
| <Safety SafetyRelease="0.0" /> | ||
| <Transfer SavedOfflineInstallationFolder="" SavedPipDestinationFolder="" SavedRuntimeUtilityCenterPackagePath="" /> | ||
| <Vc FirmwareVersion="V4.72.5" /> | ||
| </Configuration> | ||
| </Cpu> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # set environment variables | ||
| $env:AS_VERSION_SHORT = 'AS411' | ||
| Get-ChildItem "$PWD" -Recurse -Filter *.exe | Foreach-Object { | ||
| Write-Output "installing $($_.Name)"; | ||
| Write-Verbose "Into C:\BrAutomation\$env:AS_VERSION_SHORT"; | ||
| & $_.FullName -G='C:\BrAutomation' -V="C:\BrAutomation\$env:AS_VERSION_SHORT" -R | Out-Null; | ||
| if($LASTEXITCODE -ne 0) { | ||
| Write-Error "Error installing $($_.Name). Exit code $LASTEXITCODE"; | ||
| exit 1; | ||
| } | ||
| } | ||
|
Comment on lines
+1
to
+11
There was a problem hiding this comment. It looks like you're now using AsPython for upgrades, is this Powershell script still needed? There was a problem hiding this comment. It is not needed but I like the script. It can be used by people who are new to the project that want to install the upgrades |
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.