Compare commits

..

No commits in common. "7e4102e48a022b42372fc02aeae421717f32c49e" and "7fc633b223d252b2d222008e87f02b3eff00cff5" have entirely different histories.

12 changed files with 2207 additions and 124 deletions

View File

@ -1,42 +0,0 @@
name: convert-to-yml
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'build/**'
jobs:
develop-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- run: git fetch
- name: log
run: git log -10
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: yml
path: '.'
- name: get development branch name
run: |
firstString=${{ github.ref_name }}
secondString="develop/"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build/"$secondString"}
- name: GIT commit and push all changed files
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git merge --squash ${{ github.ref_name }}
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}

View File

@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is learning GitHub Actions
on: on:
push: push:
branches: branches:
- 'develop/**' - 'develop-**'
jobs: jobs:
build-branch: build-branch:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -12,7 +12,6 @@ jobs:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3 - uses: http://sigyl.com:3000/actions/setup-node@v3
with: with:
node-version: '20' node-version: '20'
@ -25,16 +24,13 @@ jobs:
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
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
./tea pr ls -f=base,head,index
echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1)
rm ./tea rm ./tea
echo PR: $PR
- run: git fetch
- name: get build branch name - name: get build branch name
run: | run: |
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="build/" secondString="build-"
echo ::set-env name=BUILD_BRANCH::${firstString/develop/"$secondString"} echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}
- name: GIT commit and push all changed files - name: GIT commit and push all changed files
env: env:
CI_COMMIT_MESSAGE: Development branch built to xml. CI_COMMIT_MESSAGE: Development branch built to xml.
@ -42,10 +38,9 @@ jobs:
run: | run: |
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 add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git checkout -b ${{ env.BUILD_BRANCH }} git checkout -b ${{ env.BUILD_BRANCH }}
git merge --squash ${{ github.ref_name }} git add -A
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml"
git push origin HEAD:${{ env.BUILD_BRANCH }} git push origin HEAD:${{ env.BUILD_BRANCH }}
- name: make pull request comment - name: make pull request comment

View File

@ -1,59 +0,0 @@
name: convert-built-to-yml
run-name: ${{ github.actor }} is learning GitHub Actions
on:
push:
branches:
- 'build-**'
jobs:
develop-branch:
runs-on: ubuntu-latest
steps:
# https://github.com/RouxAntoine/checkout/tree/v3.5.4
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
- uses: http://sigyl.com:3000/actions/setup-node@v3
with:
node-version: '20'
- name: get development branch name
run: |
firstString=${{ github.ref_name }}
secondString="develop/"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build/"$secondString"}
- name: GIT push
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
- uses: http://sigyl.com:3000/actions/batch2yaml@master
with:
action: yml
path: '.'
- name: GIT commit and push all changed files
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
# git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
#- name: push development
# env:
# CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
# CI_COMMIT_AUTHOR: Continuous Integration
# run: |
# git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
# git config --global user.email "username@users.noreply.github.com"
# git fetch --depth=1
# git add -A
# git commit -m "${{ env.CI_COMMIT_MESSAGE }}
#
# converted from batch"
# git merge origin/master --strategy-option=ours --allow-unrelated
# git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}

View File

@ -11,7 +11,6 @@ jobs:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- name: ls - name: ls
run: ls run: ls
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
@ -30,5 +29,5 @@ jobs:
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 add -A git add -A
git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} " git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml"
git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} git push origin HEAD:refs/heads/deployed-${{ github.ref_name }}

View File

@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is learning GitHub Actions
on: on:
push: push:
branches: branches:
- 'format/**' - 'format-**'
jobs: jobs:
develop-branch: develop-branch:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -12,7 +12,6 @@ jobs:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- uses: http://sigyl.com:3000/actions/setup-node@v3 - uses: http://sigyl.com:3000/actions/setup-node@v3
with: with:
node-version: '20' node-version: '20'
@ -23,8 +22,8 @@ jobs:
- name: get development branch name - name: get development branch name
run: | run: |
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop/" secondString="develop-"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format"$secondString"} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format-/"$secondString"}
- name: clone - name: clone
run: | run: |
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
@ -48,7 +47,7 @@ jobs:
git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A git add -A
git status git status
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
#- name: push development #- name: push development
# env: # env:

View File

@ -26,8 +26,8 @@ jobs:
- name: get build branch name - name: get build branch name
run: | run: |
firstString=${{ github.head_ref }} firstString=${{ github.head_ref }}
secondString="build/" secondString="build-"
echo ::set-env name=BUILD_BRANCH::${firstString/develop/"$secondString"} echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}
if_merged: if_merged:
if: github.event.pull_request.merged == true if: github.event.pull_request.merged == true
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -44,3 +44,8 @@ jobs:
repo-token: ${{ secrets.BOT_TOKEN }} repo-token: ${{ secrets.BOT_TOKEN }}
outcome: ${{ steps.delete_develop_branch.outcome }} outcome: ${{ steps.delete_develop_branch.outcome }}
test-id: Error code ${{ matrix.code }} test-id: Error code ${{ matrix.code }}
- name: get build branch name
run: |
firstString=${{ github.head_ref }}
secondString="build-"
echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}

View File

@ -32,8 +32,8 @@ jobs:
- name: get build branch name - name: get build branch name
run: | run: |
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="build/" secondString="build-"
echo ::set-env name=BUILD_BRANCH::${firstString/develop/"$secondString"} echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}
- name: GIT commit and push all changed files - name: GIT commit and push all changed files
env: env:
CI_COMMIT_MESSAGE: Reopened PR copnverted to xml. CI_COMMIT_MESSAGE: Reopened PR copnverted to xml.

1094
equipment-model.a.yml Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

BIN
tea Executable file

Binary file not shown.