Compare commits
22 Commits
master
...
build/reba
Author | SHA1 | Date |
---|---|---|
gilesb | f37f016a98 | |
gilesb | e11179187f | |
gilesb | 6926055b17 | |
gilesb | 1c2e1d8047 | |
gilesb | c3fe2f2f3a | |
gilesb | d075821c45 | |
gilesb | b2f8610a03 | |
gilesb | fd8c22de42 | |
gilesb | b96c610f18 | |
gilesb | 595f0012bb | |
gilesb | 9e7382ba53 | |
gilesb | 159c8df63c | |
gilesb | 990b7192b2 | |
giles | ae922d09c4 | |
gilesb | fa367d43d9 | |
gilesb | 399dc461c3 | |
gilesb | ee7bed8c18 | |
gilesb | 20088da9bb | |
gilesb | 589acdaee4 | |
gilesb | 2c7937596c | |
gilesb | eda88259de | |
gilesb | 836c1edfef |
|
@ -0,0 +1,99 @@
|
|||
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
|
||||
- env: env
|
||||
run: printenv
|
||||
- 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: config
|
||||
run: |
|
||||
git config --global user.name "${{ github.actor }}"
|
||||
git config --global user.email "${{ github.event.pusher.email }}"
|
||||
- name: commit
|
||||
run: |
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
- name: status
|
||||
run: |
|
||||
git branch -r
|
||||
echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
|
||||
- name: push
|
||||
run: |
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout master || git -C ../cloned checkout -b master
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
echo no development branch so pushing
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
|
||||
chmod +x ./tea;
|
||||
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }};
|
||||
if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ env.DEVELOPMENT_BRANCH }}\"" | head -c1 | wc -c) -eq 0 ]]; then
|
||||
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="
|
||||
development pull request
|
||||
this PR is instigated by and will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
|
||||
" -t="WIP: ${{ github.event.head_commit.message }}"
|
||||
fi
|
||||
echo 'pushed new branch and created pr';
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
fi;
|
||||
fi
|
|
@ -43,24 +43,8 @@ jobs:
|
|||
- name: push
|
||||
run: |
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout master || git -C ../cloned checkout -b master
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git rebase origin/master --strategy-option ours
|
||||
git log -5
|
||||
echo no development branch so pushing
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
|
||||
|
@ -75,23 +59,7 @@ jobs:
|
|||
echo 'pushed new branch and created pr';
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
|
|
|
@ -0,0 +1,93 @@
|
|||
name: build-develop-branch
|
||||
run-name: ${{ github.actor }} is learning GitHub Actions
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'develop/**'
|
||||
jobs:
|
||||
build-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'
|
||||
- env: env
|
||||
run: printenv
|
||||
- uses: http://sigyl.com:3000/actions/setup-node@v3
|
||||
with:
|
||||
node-version: '20'
|
||||
- uses: http://sigyl.com:3000/actions/batch2yaml@master
|
||||
with:
|
||||
action: xml
|
||||
path: '.'
|
||||
- run: git fetch
|
||||
- name: config
|
||||
run: |
|
||||
git config --global user.name "${{ github.actor }}"
|
||||
git config --global user.email "${{ github.event.pusher.email }}"
|
||||
- name: get build branch name
|
||||
run: |
|
||||
firstString=${{ github.ref_name }}
|
||||
secondString="build"
|
||||
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
|
||||
- name: status
|
||||
run: |
|
||||
git branch -r
|
||||
echo $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c)
|
||||
- name: push
|
||||
run: |
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
fi;
|
||||
fi;
|
||||
- name: make PR
|
||||
run: |
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||
chmod +x ./tea
|
||||
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
|
||||
if [[ $(./tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
|
||||
./tea pr c --base=master --head=${{ github.ref_name }} --description="
|
||||
development pull request
|
||||
this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
|
||||
" -t="WIP: ${{ github.event.head_commit.message }}"
|
||||
fi
|
||||
- name: get PR number
|
||||
run: |
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||
chmod +x ./tea
|
||||
pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
|
||||
export PR="${pr//[\"\'\`]/}"
|
||||
echo ::set-env name=PR::$PR
|
||||
rm ./tea
|
||||
- name: make pull request comment
|
||||
run: |
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||
chmod +x ./tea
|
||||
./tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})"
|
||||
|
|
@ -32,40 +32,31 @@ jobs:
|
|||
firstString=${{ github.ref_name }}
|
||||
secondString="build"
|
||||
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
|
||||
- name: status
|
||||
run: |
|
||||
git branch -r
|
||||
echo $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c)
|
||||
- name: push
|
||||
run: |
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git checkout -b ${{ env.BUILD_BRANCH }}
|
||||
git merge --squash ${{ github.ref_name }}
|
||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option theirs
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
fi;
|
||||
fi;
|
||||
- name: make PR
|
||||
run: |
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||
chmod +x ./tea
|
||||
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
|
||||
if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
|
||||
./tea pr ls -f=base,head -o=csv
|
||||
if [[ $(./tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
|
||||
./tea pr c --base=master --head=${{ github.ref_name }} --description="
|
||||
development pull request
|
||||
this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
|
||||
|
|
|
@ -1,81 +0,0 @@
|
|||
name: convert-to-yml
|
||||
run-name: ${{ github.actor }} is learning GitHub Actions
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'format/**'
|
||||
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'
|
||||
- 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/format\//"$secondString"\/}
|
||||
git status
|
||||
- name: clone
|
||||
run: |
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned branch -r
|
||||
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
- 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 status
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
|
||||
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 }}
|
||||
- name: make pull request
|
||||
#git fetch
|
||||
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
|
||||
# git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
|
||||
run: |
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||
chmod +x ./tea
|
||||
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
|
||||
if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then
|
||||
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}"
|
||||
fi
|
||||
rm ./tea
|
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
Loading…
Reference in New Issue