another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

Merge pull request 'ok here' (#73) from develop-7 into master
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-xml / format-branch (push) Successful in 21s Details
convert-to-yml / develop-branch (push) Has been skipped Details 

Reviewed-on: #73
This commit is contained in:
giles 2023-10-21 23:14:23 +00:00
parent e6a189ff38 33e99ed7f0
commit 3482222562
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build-develop-branch.yml
View File

@ -37,7 +37,7 @@ jobs:
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml" git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml"
git push -f origin HEAD:${{ env.BUILD_BRANCH }} git push -f origin HEAD:${{ env.BUILD_BRANCH }}
- name: make pull request - name: make pull request comment
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
chmod +x ./tea chmod +x ./tea

4
.gitea/workflows/convert-to-yml.yml
View File

@ -7,7 +7,7 @@ jobs:
if: ${{ startsWith(github.ref_name, 'format-') }} if: ${{ startsWith(github.ref_name, 'format-') }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4 # https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: RouxAntoine/checkout@v3.5.4 - uses: RouxAntoine/checkout@v3.5.4
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
@ -29,11 +29,11 @@ jobs:
ls ls
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com" git config --global user.email "username@users.noreply.github.com"
git config pull.rebase false
git checkout -b ${{ env.PRODUCTION_BRANCH }} git checkout -b ${{ env.PRODUCTION_BRANCH }}
git add -A git add -A
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
- name: make pull request - name: make pull request
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea

30
instructions/equipment-model2.a.yml
View File

@ -7,9 +7,6 @@
- Version: '1.00' - Version: '1.00'
- Area: - Area:
- UniqueName: AREA1 - UniqueName: AREA1
- EnumerationSet:
- UniqueName: PHASE_FAILURES
- Type: '0'
- EnumerationSet: - EnumerationSet:
- UniqueName: YES_NO - UniqueName: YES_NO
- Type: '1' - Type: '1'
@ -19,6 +16,9 @@
- Member: - Member:
- Name: NO - Name: NO
- Ordinal: '0' - Ordinal: '0'
- EnumerationSet:
- UniqueName: PHASE_FAILURES
- Type: '0'
- EnumerationSet: - EnumerationSet:
- UniqueName: $TIMER_TYPE - UniqueName: $TIMER_TYPE
- Type: '1' - Type: '1'
@ -135,7 +135,7 @@
- Required: '0' - Required: '0'
- ApproveSignatureTemplateName: null - ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null - RevertSignatureTemplateName: null
- Description: Confirmation by the author of the recipe that it is ready for review. - Description: Confirmation by the author of the recipe that it is ready for review.s...hhh....
- RecipeApprovalStep: - RecipeApprovalStep:
- Name: Review Recipe - Name: Review Recipe
- Id: '-3' - Id: '-3'
@ -959,7 +959,6 @@
- HyperlinkString: null - HyperlinkString: null
- ERPAlias: null - ERPAlias: null
- ConfiguredUnitName: UNIT1 - ConfiguredUnitName: UNIT1
- ConfiguredUnitName: UNIT2
- Unit: - Unit:
- attributes: - attributes:
XPos: '101' XPos: '101'
@ -982,27 +981,6 @@
- HyperlinkString: null - HyperlinkString: null
- ERPAlias: null - ERPAlias: null
- ConfiguredEquipmentModuleName: PHASE11 - ConfiguredEquipmentModuleName: PHASE11
- Unit:
- attributes:
XPos: '245'
YPos: '98'
- UniqueName: UNIT2
- Class: UNIT_CLS1
- UniqueID: '4'
- Logix5000UID: '0'
- Server: null
- MaxOwners: '1'
- CrossInvocationString: null
- CrossInvocationString: null
- CrossInvocationString: null
- CrossInvocationString: null
- CrossInvocationString: null
- HyperlinkString: null
- HyperlinkString: null
- HyperlinkString: null
- HyperlinkString: null
- HyperlinkString: null
- ERPAlias: null
- EquipmentModule: - EquipmentModule:
- attributes: - attributes:
XPos: '266' XPos: '266'